diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-08-25 19:53:32 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-08-25 19:53:32 +0000 |
| commit | 27528a611cd567b60ba684223197ed13cb47a335 (patch) | |
| tree | bcd4d9bafff4fdd30fd4710fc597eab23aa7b69d /epan/dissectors/packet-dcp-etsi.c | |
| parent | 301303ef93301f434fe6565e34ee6f66b04466b1 (diff) | |
prefs_register_protocol not req'd since no prefs; simplify reg_handoff & do minor cleanup
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26081 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-dcp-etsi.c')
| -rw-r--r-- | epan/dissectors/packet-dcp-etsi.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index 87c9c8f68d..26516caa49 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -32,7 +32,6 @@ #include <gmodule.h> #include <epan/packet.h> -#include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/crcdrm.h> #include <epan/reedsolomon.h> @@ -54,9 +53,6 @@ static int proto_dcp_etsi = -1; static int proto_af = -1; static int proto_pft = -1; static int proto_tpl = -1; -static dissector_handle_t af_handle; -static dissector_handle_t pft_handle; -static dissector_handle_t tpl_handle; static int hf_edcp_sync = -1; static int hf_edcp_len = -1; static int hf_edcp_seq = -1; @@ -645,24 +641,23 @@ dissect_tpl(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) void proto_reg_handoff_dcp_etsi (void) { - static int Initialized = FALSE; - - if (!Initialized) { - af_handle = create_dissector_handle(dissect_af, proto_af); - pft_handle = create_dissector_handle(dissect_pft, proto_pft); - tpl_handle = create_dissector_handle(dissect_tpl, proto_tpl); - heur_dissector_add("udp", dissect_dcp_etsi, proto_dcp_etsi); - dissector_add_string("dcp-etsi.sync", "AF", af_handle); - dissector_add_string("dcp-etsi.sync", "PF", pft_handle); - /* if there are ever other payload types ...*/ - dissector_add("dcp-af.pt", 'T', tpl_handle); - } + dissector_handle_t af_handle; + dissector_handle_t pft_handle; + dissector_handle_t tpl_handle; + + af_handle = create_dissector_handle(dissect_af, proto_af); + pft_handle = create_dissector_handle(dissect_pft, proto_pft); + tpl_handle = create_dissector_handle(dissect_tpl, proto_tpl); + heur_dissector_add("udp", dissect_dcp_etsi, proto_dcp_etsi); + dissector_add_string("dcp-etsi.sync", "AF", af_handle); + dissector_add_string("dcp-etsi.sync", "PF", pft_handle); + /* if there are ever other payload types ...*/ + dissector_add("dcp-af.pt", 'T', tpl_handle); } void proto_register_dcp_etsi (void) { - module_t *dcp_module; static hf_register_info hf_edcp[] = { {&hf_edcp_sync, {"sync", "dcp-etsi.sync", @@ -866,7 +861,6 @@ proto_register_dcp_etsi (void) } - dcp_module = prefs_register_protocol (proto_dcp_etsi, proto_reg_handoff_dcp_etsi); proto_register_field_array (proto_dcp_etsi, hf_edcp, array_length (hf_edcp)); proto_register_field_array (proto_af, hf_af, array_length (hf_af)); proto_register_field_array (proto_pft, hf_pft, array_length (hf_pft)); |