Fix compilation warnings in a few dissectors and try moving them to the

"clean" list.

svn path=/trunk/; revision=29313

5 files changed, 14 insertions, 14 deletions

diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index b583d53c1d..59f76df85a 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -551,6 +551,7 @@ DISSECTOR_SRC = \
 	packet-ipx.c		\
 	packet-ipxwan.c		\
 	packet-irc.c		\
+	packet-isakmp.c		\
 	packet-iscsi.c		\
 	packet-isdn.c		\
 	packet-isis-clv.c	\
@@ -572,6 +573,7 @@ DISSECTOR_SRC = \
 	packet-jpeg.c 		\
 	packet-juniper.c 	\
 	packet-jxta.c		\
+	packet-k12.c 		\
 	packet-kadm5.c		\
 	packet-kdp.c		\
 	packet-kerberos.c	\
@@ -775,6 +777,7 @@ DISSECTOR_SRC = \
 	packet-sadmind.c	\
 	packet-sap.c		\
 	packet-sbus.c 		\
+	packet-sccp.c		\
 	packet-sccpmg.c		\
 	packet-scsi.c		\
 	packet-scsi-mmc.c	\
@@ -871,6 +874,7 @@ DISSECTOR_SRC = \
 	packet-usb-masstorage.c	\
 	packet-usb-hid.c	\
 	packet-umts_fp.c	\
+	packet-user_encap.c	\
 	packet-uts.c		\
 	packet-v120.c		\
 	packet-v5ua.c		\
@@ -932,13 +936,9 @@ DISSECTOR_SRC = \
 # Dissectors with warnings.
 #
 DIRTY_DISSECTOR_SRC =	\
-	packet-isakmp.c		\
-	packet-k12.c 		\
 	packet-nbd.c		\
-	packet-sccp.c		\
 	packet-scsi-osd.c	\
-	packet-sctp.c		\
-	packet-user_encap.c
+	packet-sctp.c
 
 #
 # Headers for dissectors.
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index d16e38250b..6f608a092d 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -3897,7 +3897,7 @@ proto_register_isakmp(void)
       sizeof(ikev2_uat_data_t),
       "ikev2_decryption_table",
       TRUE,
-      (void**)&ikev2_uat_data,
+      (void*)&ikev2_uat_data,
       &num_ikev2_uat_data,
       UAT_CAT_CRYPTO,
       "ChIKEv2DecryptionSection",
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index 9f83db95f5..aeac736f4a 100644
--- a/epan/dissectors/packet-k12.c
+++ b/epan/dissectors/packet-k12.c
@@ -455,7 +455,7 @@ proto_register_k12(void)
 		    sizeof(k12_handles_t),
 		    "k12_protos",             /* filename */
 		    TRUE,                     /* from_profile */
-		    (void**) &k12_handles,    /* data_ptr */
+		    (void*) &k12_handles,    /* data_ptr */
 		    &nk12_handles,            /* numitems_ptr */
 		    UAT_CAT_FFMT,             /* category */
 		    "ChK12ProtocolsSection",  /* help */
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index d339cfe4d2..7147c179c3 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -1606,8 +1606,8 @@ dissect_sccp_data_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     guint8 ssn = INVALID_SSN;
     guint8 other_ssn = INVALID_SSN;
-    const mtp3_addr_pc_t* dpc;
-    const mtp3_addr_pc_t* opc;
+    const mtp3_addr_pc_t* dpc = NULL;
+    const mtp3_addr_pc_t* opc = NULL;
 
     if (trace_sccp && assoc && assoc != &no_assoc) {
         pinfo->sccp_info = assoc->curr_msg;
@@ -1647,13 +1647,13 @@ dissect_sccp_data_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	for (i=0; i < num_sccp_users; i++) {
 		sccp_user_t* u = &(sccp_users[i]);
 
-		if (dpc->ni != u->ni) continue;
+		if (!dpc || dpc->ni != u->ni) continue;
 
-		 if (value_is_in_range(u->called_ssn, ssn)  && value_is_in_range(u->called_pc, dpc->pc) ) {
+		if (value_is_in_range(u->called_ssn, ssn)  && value_is_in_range(u->called_pc, dpc->pc) ) {
 			handle = *(u->handlep);
 			uses_tcap = u->uses_tcap;
 			break;
-		} else if (value_is_in_range(u->called_ssn, other_ssn) && value_is_in_range(u->called_pc, opc->pc) ) {
+		} else if (value_is_in_range(u->called_ssn, other_ssn) && opc && value_is_in_range(u->called_pc, opc->pc) ) {
 			handle = *(u->handlep);
 			uses_tcap = u->uses_tcap;
 			break;
@@ -3235,7 +3235,7 @@ proto_register_sccp(void)
 	sizeof(sccp_user_t),
 	"sccp_users",
 	TRUE,
-	(void**) &sccp_users,
+	(void*) &sccp_users,
 	&num_sccp_users,
 	UAT_CAT_PORTS,
 	"ChSccpUsers",
diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index 7859883f5a..baa385e4f7 100644
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -191,7 +191,7 @@ void proto_register_user_encap(void)
 						 sizeof(user_encap_t),
 						 "user_dlts",
 						 TRUE,
-						 (void**) &encaps,
+						 (void*) &encaps,
 						 &num_encaps,
 						 UAT_CAT_FFMT,
 						 "ChUserDLTsSection",