Small cleanup of proto_reg_handoff & etc

- 'once-only' not req'd in some cases
- use find_dissector as appropriate
- remove unneeded code

svn path=/trunk/; revision=26284

6 files changed, 32 insertions, 67 deletions

diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index bf5faa21d2..8939526bff 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -268,9 +268,7 @@ static gint ett_dlci = -1;
 
 static char a_bigbuf[1024];
 
-static dissector_handle_t data_handle;
 static dissector_handle_t gsm_bsslap_handle = NULL;
-static dissector_handle_t bssmap_handle;
 static dissector_handle_t dtap_handle;
 
 static packet_info *g_pinfo;
@@ -3295,12 +3293,12 @@ proto_register_gsm_a_bssmap(void)
 void
 proto_reg_handoff_gsm_a_bssmap(void)
 {
+	dissector_handle_t bssmap_handle;
 
-	bssmap_handle = create_dissector_handle(dissect_bssmap, proto_a_bssmap);
-	dtap_handle = find_dissector("gsm_a_dtap");
-
+	bssmap_handle = find_dissector("gsm_a_bssmap");
 	dissector_add("bssap.pdu_type",  BSSAP_PDU_TYPE_BSSMAP, bssmap_handle);
-	data_handle = find_dissector("data");
+
+	dtap_handle = find_dissector("gsm_a_dtap");
 	gsm_bsslap_handle = find_dissector("gsm_bsslap");
 }
 
diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c
index 0101f909df..134e106c90 100644
--- a/epan/dissectors/packet-mtp2.c
+++ b/epan/dissectors/packet-mtp2.c
@@ -62,7 +62,6 @@ static int hf_mtp2_sf_extra  = -1;
 static gint ett_mtp2       = -1;
 
 static dissector_handle_t mtp3_handle;
-static int mtp3_proto_id;
 static gboolean use_extended_sequence_numbers_default = FALSE;
 static gboolean use_extended_sequence_numbers         = FALSE;
 
@@ -418,11 +417,9 @@ proto_reg_handoff_mtp2(void)
 {
   dissector_handle_t mtp2_handle;
 
-  mtp2_handle = create_dissector_handle(dissect_mtp2, proto_mtp2);
-
+  mtp2_handle = find_dissector("mtp2");
   dissector_add("wtap_encap", WTAP_ENCAP_MTP2, mtp2_handle);
   dissector_add("wtap_encap", WTAP_ENCAP_MTP2_WITH_PHDR, mtp2_handle);
 
   mtp3_handle   = find_dissector("mtp3");
-  mtp3_proto_id = proto_get_id_by_filter_name("mtp3");
 }
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 1da64466e2..75930a9a3a 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -3824,9 +3824,7 @@ proto_register_rpc(void)
 		&rpc_find_fragment_start);
 
 	register_dissector("rpc", dissect_rpc, proto_rpc);
-	rpc_handle = find_dissector("rpc");
 	register_dissector("rpc-tcp", dissect_rpc_tcp, proto_rpc);
-	rpc_tcp_handle = find_dissector("rpc-tcp");
 	rpc_tap = register_tap("rpc");
 
 	/*
@@ -3847,9 +3845,6 @@ proto_register_rpc(void)
 void
 proto_reg_handoff_rpc(void)
 {
-	dissector_handle_t rpc_tcp_handle;
-	dissector_handle_t rpc_udp_handle;
-
 	/* tcp/udp port 111 is used by portmapper which is an onc-rpc service.
 	   we register onc-rpc on this port so that we can choose RPC in
 	   the list offered by DecodeAs, and so that traffic to or from
@@ -3858,10 +3853,10 @@ proto_reg_handoff_rpc(void)
 	   probably RPC traffic from some randomly-chosen port that happens
 	   to match some port for which we have a dissector)
 	*/
-	rpc_tcp_handle = create_dissector_handle(dissect_rpc_tcp, proto_rpc);
+	rpc_tcp_handle = find_dissector("rpc-tcp");
 	dissector_add("tcp.port", 111, rpc_tcp_handle);
-	rpc_udp_handle = create_dissector_handle(dissect_rpc, proto_rpc);
-	dissector_add("udp.port", 111, rpc_udp_handle);
+	rpc_handle = find_dissector("rpc");
+	dissector_add("udp.port", 111, rpc_handle);
 
 	heur_dissector_add("tcp", dissect_rpc_tcp_heur, proto_rpc);
 	heur_dissector_add("udp", dissect_rpc_heur, proto_rpc);
diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c
index 3c5ff518b7..516422997f 100644
--- a/epan/dissectors/packet-sita.c
+++ b/epan/dissectors/packet-sita.c
@@ -280,30 +280,23 @@ proto_register_sita(void)
 void
 proto_reg_handoff_sita(void)
 {
-	static gboolean				inited = FALSE;
-	static dissector_handle_t	lapb_handle;
-	static dissector_handle_t	frame_relay_handle;
-	static dissector_handle_t	uts_handle;
-	static dissector_handle_t	ipars_handle;
-
-	if (!inited) {
-		dissector_handle_t sita_handle;
-
-		lapb_handle			= find_dissector("lapb");
-		frame_relay_handle	= find_dissector("fr");
-		uts_handle			= find_dissector("uts");
-		ipars_handle		= find_dissector("ipars");
-		data_handle			= find_dissector("data");
-
-		sita_handle = create_dissector_handle(dissect_sita, proto_sita);
-		dissector_add("wtap_encap", WTAP_ENCAP_SITA,		sita_handle);
-
-		dissector_add("sita.proto", SITA_PROTO_ALC,			ipars_handle);
-		dissector_add("sita.proto", SITA_PROTO_UTS,			uts_handle);
-		dissector_add("sita.proto", SITA_PROTO_BOP_LAPB,	lapb_handle);
-		dissector_add("sita.proto", SITA_PROTO_BOP_FRL,		frame_relay_handle);
-
-		inited = TRUE;
-	}
+	dissector_handle_t	lapb_handle;
+	dissector_handle_t	frame_relay_handle;
+	dissector_handle_t	uts_handle;
+	dissector_handle_t	ipars_handle;
+	dissector_handle_t	sita_handle;
+
+	lapb_handle		= find_dissector("lapb");
+	frame_relay_handle	= find_dissector("fr");
+	uts_handle		= find_dissector("uts");
+	ipars_handle		= find_dissector("ipars");
+	sita_handle 		= find_dissector("sita");
+	data_handle		= find_dissector("data");
+
+	dissector_add("sita.proto", SITA_PROTO_BOP_LAPB,	lapb_handle);
+	dissector_add("sita.proto", SITA_PROTO_BOP_FRL,		frame_relay_handle);
+	dissector_add("sita.proto", SITA_PROTO_UTS,		uts_handle);
+	dissector_add("sita.proto", SITA_PROTO_ALC,		ipars_handle);
+	dissector_add("wtap_encap", WTAP_ENCAP_SITA,		sita_handle);
 }
 
diff --git a/epan/dissectors/packet-sqloracle.c b/epan/dissectors/packet-sqloracle.c
index 9b719d63b2..a96d721139 100644
--- a/epan/dissectors/packet-sqloracle.c
+++ b/epan/dissectors/packet-sqloracle.c
@@ -90,8 +90,6 @@ static int hf_sqloracle_itemNum = -1;
 static int hf_sqloracle_numItersThisTime = -1;
 static int hf_sqloracle_uacBufLength = -1;
 
-static dissector_handle_t data_handle;
-static	dissector_handle_t sqloracle_handle;
 static char m_pCurQuery[2025];
 
 static int m_numOfUpdate =0;
@@ -779,9 +777,9 @@ proto_register_sqloracle(void)
 void
 proto_reg_handoff_sqloracle(void)
 {
+	dissector_handle_t sqloracle_handle;
 
-	sqloracle_handle = create_dissector_handle(dissect_sqloracle, proto_sqloracle);
+	sqloracle_handle = find_dissector("sqloracle");
 	dissector_add("tns.port", TCP_PORT_TNS, sqloracle_handle);
-	data_handle = find_dissector("data");
 }
 
diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c
index 7e8675c7fd..9bf014b0fc 100644
--- a/epan/dissectors/packet-xot.c
+++ b/epan/dissectors/packet-xot.c
@@ -51,7 +51,6 @@
 #define X25_MBIT_MOD128			0x01
 
 static dissector_handle_t x25_handle;
-static dissector_handle_t xot_handle;
 
 static gint proto_xot = -1;
 static gint ett_xot = -1;
@@ -303,25 +302,10 @@ proto_register_xot(void)
 void
 proto_reg_handoff_xot(void)
 {
-   static gboolean initialized = FALSE;
-   static int currentPort = -1;
+  dissector_handle_t xot_handle;
 
-   if(!initialized) {
+  xot_handle = find_dissector("xot");
+  dissector_add("tcp.port", TCP_PORT_XOT, xot_handle);
 
-	/*
-	 * Get a handle for the X.25 dissector.
-	 */
-	x25_handle = find_dissector("x.25");
-
-	xot_handle = new_create_dissector_handle(dissect_xot_tcp_heur, proto_xot);
- 
-        initialized = TRUE;
-   }
-
-   if (currentPort != -1) {
-      dissector_delete("tcp.port", currentPort, xot_handle);
-   }
-   currentPort = TCP_PORT_XOT;
-
-   dissector_add("tcp.port", currentPort, xot_handle);
+  x25_handle = find_dissector("x.25");
 }