aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-cfm.c
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2008-08-25 17:36:24 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2008-08-25 17:36:24 +0000
commit9794b1bc90342503da30259563a416075971aeda (patch)
tree40c8ffd53d3cc0e95690a1c3bcd368ea6c2cbae8 /epan/dissectors/packet-cfm.c
parentbde071bb7d249e7ba8f9135c43a0ae07830233e2 (diff)
prefs.h not req'd; cleanup reg_handoff;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26077 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-cfm.c')
-rw-r--r--epan/dissectors/packet-cfm.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c
index 8e19ba4a97..be18dc1fc1 100644
--- a/epan/dissectors/packet-cfm.c
+++ b/epan/dissectors/packet-cfm.c
@@ -35,7 +35,6 @@
#endif
#include <epan/packet.h>
-#include <epan/prefs.h>
#include <stdio.h>
#include <glib.h>
#include <string.h>
@@ -46,8 +45,6 @@
static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int proto_cfm = -1;
-static dissector_handle_t cfm_handle;
-
static const value_string opcodetypenames[] = {
{ IEE8021, "Reserved for IEE 802.1" },
@@ -809,11 +806,9 @@ void proto_register_cfm(void)
/* Register CFM OEAM protocol handler */
void proto_reg_handoff_cfm(void)
{
- static int initialized=FALSE;
- if (!initialized) {
- cfm_handle = create_dissector_handle(dissect_cfm, proto_cfm);
- dissector_add("ethertype", ETHERTYPE_CFM, cfm_handle);
- }
+ dissector_handle_t cfm_handle;
+ cfm_handle = create_dissector_handle(dissect_cfm, proto_cfm);
+ dissector_add("ethertype", ETHERTYPE_CFM, cfm_handle);
}
/* CFM EOAM sub-protocol dissectors: CCM, LBM, LBR, LTM, LTR */