From a8a4098e12b1b60548ce1a1887b2a18a54ef790f Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 28 Oct 2015 20:30:55 -0700 Subject: "Color dissector filters" are just filters. Rename the color_dissector_filters.[ch] files to just dissector_filters.[ch], and rename the routines not to include the string "color_", as those filters can be used as color filters *or* display filters. Remove "color_" from other places where we're not doing colorization. In the GTK+ code, combine the two loops that add menu items for filters in the dissector-provided filters list into one. Change-Id: I08ecccc6b1b1be675e4129a0589f36c9f240407c Reviewed-on: https://code.wireshark.org/review/11379 Reviewed-by: Guy Harris --- plugins/profinet/packet-dcerpc-pn-io.c | 6 +++--- plugins/profinet/packet-dcom-cba-acco.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/profinet') diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index 4aa82820df..c7a47c88d6 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include "packet-pn.h" @@ -12260,8 +12260,8 @@ proto_register_pn_io (void) register_cleanup_routine(pnio_cleanup); - register_color_conversation_filter("pn_io", "PN-IO AR", pn_io_ar_conv_valid, pn_io_ar_conv_filter); - register_color_conversation_filter("pn_io", "PN-IO AR (with data)", pn_io_ar_conv_valid, pn_io_ar_conv_data_filter); + register_conversation_filter("pn_io", "PN-IO AR", pn_io_ar_conv_valid, pn_io_ar_conv_filter); + register_conversation_filter("pn_io", "PN-IO AR (with data)", pn_io_ar_conv_valid, pn_io_ar_conv_data_filter); } void diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 94de1f9ae2..4e28c25a52 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include "packet-dcom-cba-acco.h" @@ -336,7 +336,7 @@ GList *cba_pdevs; const true_false_string acco_flags_set_truth = { "Set", "Not set" }; static gboolean -cba_color_filter_valid(packet_info *pinfo) +cba_filter_valid(packet_info *pinfo) { void* profinet_type = p_get_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0); @@ -344,7 +344,7 @@ cba_color_filter_valid(packet_info *pinfo) } static gchar* -cba_build_color_filter(packet_info *pinfo) +cba_build_filter(packet_info *pinfo) { gboolean is_tcp = proto_is_frame_protocol(pinfo->layers, "tcp"); void* profinet_type = p_get_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0); @@ -5113,7 +5113,7 @@ proto_register_dcom_cba_acco (void) proto_ICBAAccoSync = proto_register_protocol ("ICBAAccoSync", "ICBAAccoSync", "cba_acco_sync"); proto_register_subtree_array (ett5, array_length (ett5)); - register_color_conversation_filter("cba", "PN-CBA", cba_color_filter_valid, cba_build_color_filter); + register_conversation_filter("cba", "PN-CBA", cba_filter_valid, cba_build_filter); } -- cgit v1.2.3