aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-evrc.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2009-01-13 21:09:03 +0000
committerBill Meier <wmeier@newsguy.com>2009-01-13 21:09:03 +0000
commit2f8bc6f65e2659aeb29bb5c9883b4b15bfcaf038 (patch)
treeed7384edcd5b81ea36635693f17a39bd65cd14a8 /epan/dissectors/packet-evrc.c
parentba1cb8b69e513e4bd45d4d270fe977669ae1290b (diff)
Minor changes related to reg_handoff_ & proto_register_
svn path=/trunk/; revision=27225
Diffstat (limited to 'epan/dissectors/packet-evrc.c')
-rw-r--r--epan/dissectors/packet-evrc.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c
index e8eb8764dc..0102a3573d 100644
--- a/epan/dissectors/packet-evrc.c
+++ b/epan/dissectors/packet-evrc.c
@@ -154,10 +154,6 @@ static int hf_evrc_legacy_toc_frame_type = -1;
static gint ett_evrc = -1;
static gint ett_toc = -1;
-static dissector_handle_t evrc_handle;
-static dissector_handle_t evrcb_handle;
-static dissector_handle_t evrcwb_handle;
-static dissector_handle_t evrc_legacy_handle;
static packet_info *g_pinfo;
static proto_tree *g_tree;
@@ -507,15 +503,24 @@ void
proto_reg_handoff_evrc(void)
{
static gboolean evrc_prefs_initialized = FALSE;
-
+ static dissector_handle_t evrc_legacy_handle;
if (!evrc_prefs_initialized)
{
- evrc_handle = create_dissector_handle(dissect_evrc, proto_evrc);
- evrcb_handle = create_dissector_handle(dissect_evrcb, proto_evrc);
- evrcwb_handle = create_dissector_handle(dissect_evrcwb, proto_evrc);
+ dissector_handle_t evrc_handle;
+ dissector_handle_t evrcb_handle;
+ dissector_handle_t evrcwb_handle;
+
+ evrc_handle = create_dissector_handle(dissect_evrc, proto_evrc);
+ evrcb_handle = create_dissector_handle(dissect_evrcb, proto_evrc);
+ evrcwb_handle = create_dissector_handle(dissect_evrcwb, proto_evrc);
evrc_legacy_handle = create_dissector_handle(dissect_evrc_legacy, proto_evrc);
+ /* header-full mime types */
+ dissector_add_string("rtp_dyn_payload_type", "EVRC", evrc_handle);
+ dissector_add_string("rtp_dyn_payload_type", "EVRCB", evrcb_handle);
+ dissector_add_string("rtp_dyn_payload_type", "EVRCWB", evrcwb_handle);
+
evrc_prefs_initialized = TRUE;
}
else
@@ -528,8 +533,4 @@ proto_reg_handoff_evrc(void)
dissector_add("rtp.pt", 60, evrc_legacy_handle);
}
- /* header-full mime types */
- dissector_add_string("rtp_dyn_payload_type", "EVRC", evrc_handle);
- dissector_add_string("rtp_dyn_payload_type", "EVRCB", evrcb_handle);
- dissector_add_string("rtp_dyn_payload_type", "EVRCWB", evrcwb_handle);
}