diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-02-26 01:00:25 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-02-26 01:00:25 +0000 |
| commit | 88a5865b64a8856d97b46c16e55c3e183828c740 (patch) | |
| tree | cb65d029ad49938f02e74e66dc8168d45b23d565 /epan/dissectors/packet-adwin-config.c | |
| parent | 162817ad33208c00ed5c99618eff77ff44d6f277 (diff) | |
No need for 'if (...initialized) {...}' in proto_reg_handoff...()
svn path=/trunk/; revision=47890
Diffstat (limited to 'epan/dissectors/packet-adwin-config.c')
| -rw-r--r-- | epan/dissectors/packet-adwin-config.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c index 82102b1ff5..60d446121a 100644 --- a/epan/dissectors/packet-adwin-config.c +++ b/epan/dissectors/packet-adwin-config.c @@ -449,7 +449,7 @@ dissect_adwin_config(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * || pinfo->destport == ADWIN_CONFIGURATION_PORT)) return 0; - if (pinfo->ipproto != IP_PROTO_UDP && pinfo->ipproto != IP_PROTO_TCP) + if ((pinfo->ipproto != IP_PROTO_UDP) && (pinfo->ipproto != IP_PROTO_TCP)) return 0; if (! (is_adwin_mac_or_broadcast(pinfo->dl_src) || is_adwin_mac_or_broadcast(pinfo->dl_dst))) @@ -760,11 +760,6 @@ proto_register_adwin_config(void) void proto_reg_handoff_adwin_config(void) { - static int adwin_config_prefs_initialized = FALSE; - - if ( ! adwin_config_prefs_initialized ) { - heur_dissector_add("udp", dissect_adwin_config, proto_adwin_config); - heur_dissector_add("tcp", dissect_adwin_config, proto_adwin_config); - adwin_config_prefs_initialized = TRUE; - } + heur_dissector_add("udp", dissect_adwin_config, proto_adwin_config); + heur_dissector_add("tcp", dissect_adwin_config, proto_adwin_config); } |