Minor cleanups related to proto_reg_handoff

svn path=/trunk/; revision=26277

14 files changed, 7 insertions, 44 deletions

diff --git a/epan/dissectors/packet-dcom.h b/epan/dissectors/packet-dcom.h
index 9859c44294..d6d74b4079 100644
--- a/epan/dissectors/packet-dcom.h
+++ b/epan/dissectors/packet-dcom.h
@@ -39,7 +39,7 @@ extern int hf_dcom_ipid;
 extern GHashTable *dcom_uuids;
 
 /* preferences */
-extern int dcom_prefs_display_unmarshalling_details;
+extern gboolean dcom_prefs_display_unmarshalling_details;
 
 
 typedef struct dcom_machine_s {
diff --git a/epan/dissectors/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c
index a4d31b5ef5..7545685947 100644
--- a/epan/dissectors/packet-msn-messenger.c
+++ b/epan/dissectors/packet-msn-messenger.c
@@ -62,8 +62,6 @@ static int proto_msnms = -1;
 
 static gint ett_msnms = -1;
 
-static dissector_handle_t data_handle;
-
 #define TCP_PORT_MSNMS			1863
 
 static void
@@ -145,7 +143,6 @@ proto_reg_handoff_msnms(void)
 
   msnms_handle = create_dissector_handle(dissect_msnms, proto_msnms);
   dissector_add("tcp.port", TCP_PORT_MSNMS, msnms_handle);
-  data_handle = find_dissector("data");
   /*
    * For MSN Messenger Protocol over HTTP
    */
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index 1d5f8a7ca0..8830aeed89 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -539,8 +539,6 @@ typedef struct my_stmt_data
 
 
 /* function prototypes */
-void proto_reg_handoff_mysql(void);
-void proto_register_mysql(void);
 static void mysql_dissect_init(void);
 static void dissect_mysql(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 static guint get_mysql_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset);
diff --git a/epan/dissectors/packet-ncs.c b/epan/dissectors/packet-ncs.c
index ef5ec3c7e2..9359d40b82 100644
--- a/epan/dissectors/packet-ncs.c
+++ b/epan/dissectors/packet-ncs.c
@@ -93,11 +93,6 @@ void
 proto_reg_handoff_ncs(void)
 {
   dissector_handle_t ncs_handle;
-  dissector_handle_t ip_handle;
-  /*
-   * Get handle for the IP dissector.
-   */
-  ip_handle = find_dissector("ip");
 
   ncs_handle = create_dissector_handle(dissect_ncs, proto_ncs);
   dissector_add("ip.proto", IP_PROTO_NCS_HEARTBEAT, ncs_handle);
diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c
index 4b119aeed3..60fe4e9b8a 100644
--- a/epan/dissectors/packet-pktgen.c
+++ b/epan/dissectors/packet-pktgen.c
@@ -60,7 +60,7 @@ static int hf_pktgen_timestamp = -1;
 static gint ett_pktgen = -1;
 
 /* data dissector handle */
-static dissector_handle_t data_handle = NULL;
+static dissector_handle_t data_handle;
 
 /* entry point */
 static gboolean dissect_pktgen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c
index e0ea1f750e..ebbe2fbf7e 100644
--- a/epan/dissectors/packet-portmap.c
+++ b/epan/dissectors/packet-portmap.c
@@ -69,7 +69,6 @@ static gint ett_portmap_rpcb = -1;
 static gint ett_portmap_entry = -1;
 
 static dissector_handle_t rpc_handle;
-static dissector_handle_t rpc_tcp_handle;
 
 /* Dissect a getport call */
 static int
@@ -661,5 +660,4 @@ proto_reg_handoff_portmap(void)
 	rpc_init_proc_table(PORTMAP_PROGRAM, 3, portmap3_proc, hf_portmap_procedure_v3);
 	rpc_init_proc_table(PORTMAP_PROGRAM, 4, portmap4_proc, hf_portmap_procedure_v4);
 	rpc_handle = find_dissector("rpc");
-	rpc_tcp_handle = find_dissector("rpc-tcp");
 }
diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c
index bc2220e0d0..424c1d6d71 100644
--- a/epan/dissectors/packet-rdm.c
+++ b/epan/dissectors/packet-rdm.c
@@ -273,5 +273,4 @@ proto_register_rdm(void)
 void
 proto_reg_handoff_rdm(void)
 {
-	create_dissector_handle(dissect_rdm, proto_rdm);
 }
diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c
index 4f61bc7cb8..582ba6a101 100644
--- a/epan/dissectors/packet-rfc2190.c
+++ b/epan/dissectors/packet-rfc2190.c
@@ -77,7 +77,7 @@ static int hf_rfc2190_hmv2 = -1;
 static int hf_rfc2190_vmv2 = -1;
 
 static gint ett_rfc2190			= -1;
-static dissector_handle_t h263_handle = NULL;
+static dissector_handle_t h263_handle;
 
 
 static void
diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
index ea14ae602c..16c4f0f11b 100644
--- a/epan/dissectors/packet-rsl.c
+++ b/epan/dissectors/packet-rsl.c
@@ -175,8 +175,8 @@ static int ett_ie_message_id = -1;
 static int ett_ie_sys_info_type = -1;
 
 proto_tree *top_tree;
-dissector_handle_t gsm_a_ccch_handle = NULL;
-dissector_handle_t gsm_a_dtap_handle = NULL;
+dissector_handle_t gsm_a_ccch_handle;
+dissector_handle_t gsm_a_dtap_handle;
 
 static gboolean is_si2q = FALSE;
 
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index e67829681a..213b86784d 100644
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -1165,7 +1165,6 @@ static gint ett_skinny_softKeyMap = -1;
 /* desegmentation of SCCP */
 static gboolean skinny_desegment = TRUE;
 
-static dissector_handle_t data_handle;
 static dissector_handle_t rtp_handle=NULL;
 
 /* Get the length of a single SCCP PDU */
@@ -4259,7 +4258,6 @@ proto_reg_handoff_skinny(void)
 {
   dissector_handle_t skinny_handle;
 
-  data_handle = find_dissector("data");
   rtp_handle = find_dissector("rtp");
   skinny_handle = new_create_dissector_handle(dissect_skinny, proto_skinny);
   dissector_add("tcp.port", TCP_PORT_SKINNY, skinny_handle);
diff --git a/epan/dissectors/packet-sndcp-xid.c b/epan/dissectors/packet-sndcp-xid.c
index da3fbc3516..728729c4bb 100644
--- a/epan/dissectors/packet-sndcp-xid.c
+++ b/epan/dissectors/packet-sndcp-xid.c
@@ -156,10 +156,6 @@ static gint ett_sndcp_xid                = -1;
 static gint ett_sndcp_xid_version_field  = -1;
 static gint ett_sndcp_comp_field        = -1;
 
-/* dissectors for the data portion of this protocol
- */
-static dissector_handle_t data_handle;
-
 static void parse_compression_parameters(tvbuff_t *tvb, proto_tree *tree, gboolean dcomp);
 /******************************************************/
 /* Compression algorithms element dissector functions */
@@ -895,7 +891,4 @@ proto_register_sndcp_xid(void)
 void
 proto_reg_handoff_sndcp_xid(void)
 {
-  /* Find data handle for upper layer dissectors 
-   */
-  data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c
index 43217dd27a..b72db883f9 100644
--- a/epan/dissectors/packet-sscf-nni.c
+++ b/epan/dissectors/packet-sscf-nni.c
@@ -39,7 +39,6 @@ static int proto_sscf = -1;
 static gint ett_sscf = -1;
 
 static dissector_handle_t mtp3_handle;
-static dissector_handle_t data_handle;
 
 #define SSCF_PDU_LENGTH 4
 #define SSCF_STATUS_OFFSET 3
@@ -137,12 +136,5 @@ proto_register_sscf(void)
 void
 proto_reg_handoff_sscf(void)
 {
-  static dissector_handle_t sscf_handle; 	 
-
-
-  sscf_handle = create_dissector_handle(dissect_sscf_nni, proto_sscf); 	 
-
   mtp3_handle = find_dissector("mtp3");
-  data_handle = find_dissector("data");
-
 }
diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c
index 4f4713e236..417bdb6657 100644
--- a/epan/dissectors/packet-turbocell.c
+++ b/epan/dissectors/packet-turbocell.c
@@ -97,9 +97,9 @@ static gint ett_msdu_aggregation_parent_tree = -1;
 static gint ett_msdu_aggregation_subframe_tree = -1;
 
 /* The ethernet dissector we hand off to */
-static dissector_handle_t eth_handle=NULL;
+static dissector_handle_t eth_handle;
 
-static dissector_handle_t data_handle=NULL;
+static dissector_handle_t data_handle;
 
 static const value_string turbocell_type_values[] = {
     { TURBOCELL_TYPE_BEACON_NON_POLLING, "Beacon (Non-Polling Base Station)" },
@@ -365,11 +365,7 @@ void proto_register_turbocell(void)
 
 void proto_reg_handoff_turbocell(void)
 {
-    dissector_handle_t turbocell_handle;
-
     eth_handle = find_dissector("eth_withoutfcs");
     data_handle = find_dissector("data");
-
-    turbocell_handle = create_dissector_handle(dissect_turbocell, proto_turbocell);
 }
 
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c
index 118d664692..0cfd258817 100644
--- a/epan/dissectors/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
@@ -189,8 +189,6 @@ static gint ett_x11_same_screen_focus = -1;
 /* desegmentation of X11 messages */
 static gboolean x11_desegment = TRUE;
 
-static dissector_handle_t data_handle;
-
 #define TCP_PORT_X11			6000
 #define TCP_PORT_X11_2			6001
 #define TCP_PORT_X11_3			6002
@@ -5366,6 +5364,5 @@ proto_reg_handoff_x11(void)
   dissector_add("tcp.port", TCP_PORT_X11, x11_handle);
   dissector_add("tcp.port", TCP_PORT_X11_2, x11_handle);
   dissector_add("tcp.port", TCP_PORT_X11_3, x11_handle);
-  data_handle = find_dissector("data");
 }