[-Wmissing-prototypes]

Use explicit casts.

svn path=/trunk/; revision=48334

6 files changed, 14 insertions, 6 deletions

diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c
index 5369e7627c..00f6c02a12 100644
--- a/epan/dissectors/packet-cfm.c
+++ b/epan/dissectors/packet-cfm.c
@@ -77,6 +77,9 @@
 #define ORG_SPEC_TLV	0x1F
 #define TEST_TLV        0x20
 
+void proto_register_cfm(void);
+void proto_reg_handoff_cfm(void);
+
 static int proto_cfm = -1;
 
 static const value_string opcodetypenames[] = {
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c
index ddfb9c5e4c..27313d0970 100644
--- a/epan/dissectors/packet-cigi.c
+++ b/epan/dissectors/packet-cigi.c
@@ -2637,14 +2637,14 @@ dissect_cigi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
 
     /* Format the Info String */
-    src_str = (const char*)ip_to_str(pinfo->src.data);
+    src_str = (const char*)ip_to_str((const guint8 *)pinfo->src.data);
     if ( !g_ascii_strcasecmp(global_host_ip, src_str) ) {
         src_str = "Host";
     } else if ( !g_ascii_strcasecmp(global_ig_ip, src_str) ) {
         src_str = "IG";
     }
 
-    dest_str = (const char*)ip_to_str(pinfo->dst.data);
+    dest_str = (const char*)ip_to_str((const guint8 *)pinfo->dst.data);
     if ( !g_ascii_strcasecmp(global_host_ip, dest_str) ) {
         dest_str = "Host";
     } else if ( !g_ascii_strcasecmp(global_ig_ip, dest_str) ) {
diff --git a/epan/dissectors/packet-cnip.c b/epan/dissectors/packet-cnip.c
index 079442e663..6d5011e9eb 100644
--- a/epan/dissectors/packet-cnip.c
+++ b/epan/dissectors/packet-cnip.c
@@ -52,6 +52,7 @@ static const value_string type_tuple[]=
 	{0, NULL}
 };
 
+void proto_register_cnip(void);
 void proto_reg_handoff_cnip(void);
 
 static gint hf_cnip_len			= -1;
diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c
index f1cee8f5e3..4e11d62d62 100644
--- a/epan/dissectors/packet-collectd.c
+++ b/epan/dissectors/packet-collectd.c
@@ -47,6 +47,8 @@
 #define TYPE_SIGN_SHA256     0x0200
 #define TYPE_ENCR_AES256     0x0210
 
+void proto_register_collectd(void);
+
 typedef struct value_data_s {
 	gchar *host;
 	gint host_off;
@@ -212,7 +214,7 @@ collectd_stats_tree_packet (stats_tree *st, packet_info *pinfo _U_,
 	const tap_data_t *td;
 	string_counter_t *sc;
 
-	td = user_data;
+	td = (const tap_data_t *)user_data;
 	if (td == NULL)
 		return (-1);
 
@@ -819,7 +821,7 @@ stats_account_string (string_counter_t **ret_list, const gchar *new_value)
 			return (0);
 		}
 
-	entry = ep_alloc0 (sizeof (*entry));
+	entry = (string_counter_t *)ep_alloc0 (sizeof (*entry));
 	entry->string = ep_strdup (new_value);
 	entry->count = 1;
 	entry->next = *ret_list;
diff --git a/epan/dissectors/packet-componentstatus.c b/epan/dissectors/packet-componentstatus.c
index cfbc0b3759..6973d492f8 100644
--- a/epan/dissectors/packet-componentstatus.c
+++ b/epan/dissectors/packet-componentstatus.c
@@ -45,6 +45,8 @@
 
 #define CSPT_REPORT
 
+void proto_register_componentstatus(void);
+void proto_reg_handoff_componentstatus(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_componentstatusprotocol             = -1;
diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c
index 67e9482f40..ba300d036d 100644
--- a/epan/dissectors/packet-cpha.c
+++ b/epan/dissectors/packet-cpha.c
@@ -30,8 +30,8 @@
 #include <epan/packet.h>
 #include <epan/ipproto.h>
 
-void proto_register_chpa(void);
-void proto_reg_handoff_chpa(void);
+void proto_register_cpha(void);
+void proto_reg_handoff_cpha(void);
 
 static int proto_cphap = -1;