diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-10-28 20:30:55 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-10-29 03:32:30 +0000 |
| commit | a8a4098e12b1b60548ce1a1887b2a18a54ef790f (patch) | |
| tree | 1c1c7b32c714bb63c60f8b3073eb78317bfe364a /epan/dissectors/packet-enip.c | |
| parent | 0257a30de62d1cc19e437b937026a14db3665a6f (diff) | |
"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 <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-enip.c')
| -rw-r--r-- | epan/dissectors/packet-enip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 409c601682..c758b309b0 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -36,7 +36,7 @@ #include "config.h" #include <epan/packet.h> -#include <epan/color_dissector_filters.h> +#include <epan/dissector_filters.h> #include <epan/prefs.h> #include <epan/etypes.h> #include <epan/expert.h> @@ -3736,8 +3736,8 @@ proto_register_enip(void) proto_register_field_array(proto_dlr, hfdlr, array_length(hfdlr)); proto_register_subtree_array(ettdlr, array_length(ettdlr)); - register_color_conversation_filter("enip", "ENIP IO", enip_io_conv_valid, enip_io_conv_filter); - register_color_conversation_filter("enip", "ENIP Explicit", enip_exp_conv_valid, enip_exp_conv_filter); + register_conversation_filter("enip", "ENIP IO", enip_io_conv_valid, enip_io_conv_filter); + register_conversation_filter("enip", "ENIP Explicit", enip_exp_conv_valid, enip_exp_conv_filter); register_decode_as(&enip_da); |