[-Wmissing-prototypes]

Use explicit casts.

svn path=/trunk/; revision=48341

41 files changed, 134 insertions, 41 deletions

diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c
index 8f9756b6ee..5525d561be 100644
--- a/epan/dissectors/packet-dcom.c
+++ b/epan/dissectors/packet-dcom.c
@@ -96,6 +96,9 @@
 #include "packet-dcerpc.h"
 #include "packet-dcom.h"
 
+void proto_register_dcom (void);
+void proto_reg_handoff_dcom (void);
+
 static int proto_dcom = -1;
 
 gboolean dcom_prefs_display_unmarshalling_details = FALSE;
@@ -261,15 +264,15 @@ void dcom_interface_dump(void) {
 
 
 	for(machines = dcom_machines; machines != NULL; machines = g_list_next(machines)) {
-		machine = machines->data;
+		machine = (dcom_machine_t *)machines->data;
 		g_warning("Machine(#%4u): IP:%s", machine->first_packet, ip_to_str(machine->ip));
 
 		for(objects = machine->objects; objects != NULL; objects = g_list_next(objects)) {
-			object = objects->data;
+			object = (dcom_object_t *)objects->data;
 			g_warning(" Object(#%4u): OID:0x%" G_GINT64_MODIFIER "x private:%p", object->first_packet, object->oid, object->private_data);
 
 			for(interfaces = object->interfaces; interfaces != NULL; interfaces = g_list_next(interfaces)) {
-				interf = interfaces->data;
+				interf = (dcom_interface_t *)interfaces->data;
 				g_warning("  Interface(#%4u): iid:%s",
 					  interf->first_packet, guids_resolve_uuid_to_str(&interf->iid));
 				g_warning("   ipid:%s", guids_resolve_uuid_to_str(&interf->ipid));
@@ -291,7 +294,7 @@ dcom_interface_t *dcom_interface_find(packet_info *pinfo _U_, const guint8 *ip _
 	}
 
 	for(interfaces = dcom_interfaces; interfaces != NULL; interfaces = g_list_next(interfaces)) {
-		interf = interfaces->data;
+		interf = (dcom_interface_t *)interfaces->data;
 
 		if(memcmp(&interf->ipid, ipid, sizeof(e_uuid_t)) == 0) {
 			return interf;
@@ -319,7 +322,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const guint8 *ip, e_uui
 	if(oxid == 0 || oid == 0) {
 		/*g_warning("interface_new#%u", pinfo->fd->num);*/
 
-		interf = se_alloc(sizeof(dcom_interface_t));
+		interf = se_new(dcom_interface_t);
 		interf->parent = NULL;
 		interf->private_data = NULL;
 		interf->first_packet = pinfo->fd->num;
@@ -333,7 +336,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const guint8 *ip, e_uui
 	/* find machine */
 	dcom_iter = dcom_machines;
 	while(dcom_iter != NULL) {
-		machine = dcom_iter->data;
+		machine = (dcom_machine_t *)dcom_iter->data;
 		if(memcmp(machine->ip, ip, 4) == 0) {
 			break;
 		}
@@ -342,7 +345,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const guint8 *ip, e_uui
 
 	/* create new machine if not found */
 	if(dcom_iter == NULL) {
-		machine = g_malloc(sizeof(dcom_machine_t));
+		machine = g_new(dcom_machine_t,1);
 		memcpy(machine->ip, ip, 4);
 		machine->objects = NULL;
 		machine->first_packet = pinfo->fd->num;
@@ -352,7 +355,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const guint8 *ip, e_uui
 	/* find object */
 	dcom_iter = machine->objects;
 	while(dcom_iter != NULL) {
-		object = dcom_iter->data;
+		object = (dcom_object_t *)dcom_iter->data;
 		if(object->oid == oid) {
 			break;
 		}
@@ -361,7 +364,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const guint8 *ip, e_uui
 
 	/* create new object if not found */
 	if(dcom_iter == NULL) {
-		object = g_malloc(sizeof(dcom_object_t));
+		object = g_new(dcom_object_t,1);
 		object->parent = machine;
 		object->interfaces = NULL;
 		object->private_data = NULL;
@@ -375,7 +378,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const guint8 *ip, e_uui
 	/* find interface */
 	dcom_iter = object->interfaces;
 	while(dcom_iter != NULL) {
-		interf = dcom_iter->data;
+		interf = (dcom_interface_t *)dcom_iter->data;
 		if(memcmp(&interf->ipid, ipid, sizeof(e_uuid_t)) == 0) {
 			break;
 		}
@@ -384,7 +387,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const guint8 *ip, e_uui
 
 	/* create new interface if not found */
 	if(dcom_iter == NULL) {
-		interf = g_malloc(sizeof(dcom_interface_t));
+		interf = g_new(dcom_interface_t,1);
 		interf->parent = object;
 		interf->private_data = NULL;
 		interf->first_packet = pinfo->fd->num;
@@ -1938,7 +1941,7 @@ dcom_register_rountine(dcom_dissect_fn_t routine, e_uuid_t* uuid)
 	if (dcom_get_rountine_by_uuid(uuid))
 		return -1;
 
-	marshaler = se_alloc(sizeof(dcom_marshaler_t));
+	marshaler = se_new(dcom_marshaler_t);
 	if (!marshaler) {
 		/*memory error*/
 		return -1;
@@ -1967,7 +1970,7 @@ dcom_get_rountine_by_uuid(const e_uuid_t* uuid)
 
 	for(marshalers = dcom_marshalers; marshalers!= NULL;
 		    marshalers = g_list_next(marshalers)) {
-		marsh = marshalers->data;
+		marsh = (dcom_marshaler_t *)marshalers->data;
 		/*print_uuid(&marsh->uuid);*/
 		/*print_uuid(uuid);*/
 		if(memcmp(&marsh->uuid, uuid, sizeof(e_uuid_t)) == 0) {
@@ -2152,12 +2155,12 @@ static void dcom_reinit( void) {
 		GList *machines;
 
 		for(machines = dcom_machines; machines != NULL; machines = g_list_next(machines)) {
-			dcom_machine_t *machine = machines->data;
+			dcom_machine_t *machine = (dcom_machine_t *)machines->data;
 
 			if (machine->objects != NULL) {
 				GList *objects;
 				for(objects = machine->objects; objects != NULL; objects = g_list_next(objects)) {
-					dcom_object_t *object = objects->data;
+					dcom_object_t *object = (dcom_object_t *)objects->data;
 
 					if (object->interfaces != NULL) {
 						GList *interface;
diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c
index df148953c7..dd1f0653be 100644
--- a/epan/dissectors/packet-ddtp.c
+++ b/epan/dissectors/packet-ddtp.c
@@ -30,6 +30,9 @@
 #include <epan/packet.h>
 #include "packet-ddtp.h"
 
+void proto_register_ddtp (void);
+void proto_reg_handoff_ddtp (void);
+
 static int proto_ddtp = -1;
 static int hf_ddtp_version = -1;
 static int hf_ddtp_encrypt = -1;
diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c
index 6027c2da15..17fa169e65 100644
--- a/epan/dissectors/packet-dec-dnart.c
+++ b/epan/dissectors/packet-dec-dnart.c
@@ -93,6 +93,9 @@ typedef enum {
 #define RT_FLAGS_DISCARD       0x40
 #define RT_FLAGS_PAD           0x80
 
+void proto_register_dec_rt(void);
+void proto_reg_handoff_dec_rt(void);
+
 static int proto_dec_rt = -1;
 
 static int hf_dec_routing_flags = -1;
@@ -352,7 +355,7 @@ static void
 set_dnet_address(address *paddr_src, address *paddr_tgt)
 {
     if (paddr_tgt->type != AT_STRINGZ && paddr_src->type == AT_ETHER) {
-        char *addr = dnet_ntoa(paddr_src->data);
+        char *addr = dnet_ntoa((const guint8 *)paddr_src->data);
         if (addr != NULL)
             SET_ADDRESS(paddr_tgt, AT_STRINGZ, 1, addr);
     }
@@ -459,7 +462,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         offset += 3;
         ti = proto_tree_add_item(rt_tree, hf_dec_rt_dst_addr, tvb,
                 offset, 6, ENC_NA);
-        addr = dnet_ntoa(ep_tvb_memdup(tvb, offset, 6));
+        addr = dnet_ntoa((const guint8 *)ep_tvb_memdup(tvb, offset, 6));
         if (addr != NULL) {
             proto_item_append_text(ti, " (%s)", addr);
         }
@@ -470,7 +473,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         offset += 8;
         ti = proto_tree_add_item(rt_tree, hf_dec_rt_src_addr, tvb,
             offset, 6, ENC_NA);
-        addr = dnet_ntoa(ep_tvb_memdup(tvb, offset, 6));
+        addr = dnet_ntoa((const guint8 *)ep_tvb_memdup(tvb, offset, 6));
         if (addr != NULL) {
             proto_item_append_text(ti, " (%s)", addr);
         }
@@ -718,7 +721,7 @@ do_hello_msg(
     my_offset +=3;
     ti = proto_tree_add_item(tree, hf_dec_rt_id, tvb,
         my_offset, 6, ENC_NA);
-    addr = dnet_ntoa(ep_tvb_memdup(tvb, my_offset, 6));
+    addr = dnet_ntoa((const guint8 *)ep_tvb_memdup(tvb, my_offset, 6));
     if (addr != NULL) {
         proto_item_append_text(ti, " (%s)", addr);
     }
@@ -762,7 +765,7 @@ do_hello_msg(
         my_offset += 8;
         ti = proto_tree_add_item(tree, hf_dec_rt_neighbor, tvb,
                 my_offset, 6, ENC_NA);
-        addr = dnet_ntoa(ep_tvb_memdup(tvb, my_offset, 6));
+        addr = dnet_ntoa((const guint8 *)ep_tvb_memdup(tvb, my_offset, 6));
         if (addr != NULL) {
             proto_item_append_text(ti, " (%s)", addr);
         }
@@ -811,7 +814,7 @@ do_hello_msg(
 
                 ti_localb = proto_tree_add_item(list_ether, hf_dec_rt_router_id,
                     tvb, my_offset, 6, ENC_NA);
-                addr = dnet_ntoa(ep_tvb_memdup(tvb, my_offset, 6));
+                addr = dnet_ntoa((const guint8 *)ep_tvb_memdup(tvb, my_offset, 6));
                 if (addr != NULL) {
                     proto_item_append_text(ti_localb, " (%s)", addr);
                 }
diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c
index e82fb84eec..33902b4159 100644
--- a/epan/dissectors/packet-dect.c
+++ b/epan/dissectors/packet-dect.c
@@ -89,6 +89,8 @@ static const guint8 scrt[8][31]=
 	{0x79, 0xA4, 0x2B, 0xB1, 0x0C, 0xB7, 0xA8, 0x9D, 0xE6, 0x90, 0xAE, 0xC4, 0x32, 0xDE, 0xA2, 0x77, 0x9A, 0x42, 0xBB, 0x10, 0xCB, 0x7A, 0x89, 0xDE, 0x69, 0x0A, 0xEC, 0x43, 0x2D, 0xEA, 0x27}
 };
 
+void proto_register_dect (void);
+void proto_reg_handoff_dect (void);
 
 static int proto_dect = -1;
 
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c
index dc62309443..69156c302f 100644
--- a/epan/dissectors/packet-dhcp-failover.c
+++ b/epan/dissectors/packet-dhcp-failover.c
@@ -48,6 +48,9 @@
 
 #define TCP_PORT_DHCPFO 519
 
+void proto_register_dhcpfo(void);
+void proto_reg_handoff_dhcpfo(void);
+
 static guint tcp_port_pref = TCP_PORT_DHCPFO;
 
 /* desegmentation of DHCP failover over TCP */
@@ -875,8 +878,6 @@ dissect_dhcpfo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 /* Register the protocol with Wireshark */
 
-void proto_reg_handoff_dhcpfo(void);
-
 void
 proto_register_dhcpfo(void)
 {
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index 2acc692833..52bb600253 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -63,6 +63,9 @@
 #include "packet-arp.h"
 #include "packet-dns.h"                         /* for get_dns_name() */
 
+void proto_register_dhpcv6(void);
+void proto_reg_handoff_dhpcv6(void);
+
 static gboolean dhcpv6_bulk_leasequery_desegment  = TRUE;
 
 static int proto_dhcpv6 = -1;
diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c
index 83ec236ffd..63f392aa6b 100644
--- a/epan/dissectors/packet-diameter_3gpp.c
+++ b/epan/dissectors/packet-diameter_3gpp.c
@@ -41,6 +41,9 @@
 #include "packet-e212.h"
 #include "packet-ntp.h"
 
+void proto_register_diameter_3gpp(void);
+void proto_reg_handoff_diameter_3gpp(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_diameter_3gpp          = -1;
 
diff --git a/epan/dissectors/packet-dis-fields.c b/epan/dissectors/packet-dis-fields.c
index 1e2e72b124..e6f3d9cab1 100644
--- a/epan/dissectors/packet-dis-fields.c
+++ b/epan/dissectors/packet-dis-fields.c
@@ -921,7 +921,7 @@ gint parseField_Float(tvbuff_t *tvb, proto_tree *tree, gint offset, DIS_ParserNo
 
 /* Parse a 4-byte floating-point value, given text label.
  */
-gint parseField_Float_Text(tvbuff_t *tvb, proto_tree *tree, gint offset, gchar *charStr)
+static gint parseField_Float_Text(tvbuff_t *tvb, proto_tree *tree, gint offset, gchar *charStr)
 {
     gfloat floatVal;
 
diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c
index bb8ee47758..3595352068 100644
--- a/epan/dissectors/packet-dis.c
+++ b/epan/dissectors/packet-dis.c
@@ -52,6 +52,7 @@
 /* Encoding type the last 14 bits */
 #define DIS_ENCODING_TYPE(word) ((word) & 0x3FFF)
 
+void proto_register_dis(void);
 
 static gint proto_dis = -1;
 int hf_dis_proto_ver = -1;
diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c
index 488799b379..04f3d0462c 100644
--- a/epan/dissectors/packet-distcc.c
+++ b/epan/dissectors/packet-distcc.c
@@ -62,6 +62,7 @@ static gboolean distcc_desegment = TRUE;
 
 static guint glb_distcc_tcp_port = TCP_PORT_DISTCC;
 
+void proto_register_distcc(void);
 extern void proto_reg_handoff_distcc(void);
 
 #define CHECK_PDU_LEN(x) \
diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c
index ea0b850ba0..3c58fef6d5 100644
--- a/epan/dissectors/packet-dlm3.c
+++ b/epan/dissectors/packet-dlm3.c
@@ -170,6 +170,7 @@
 #define DLM3_RESNAME_MAXLEN     64
 
 /* Forward declaration we need below */
+void proto_register_dlm3(void);
 void proto_reg_handoff_dlm3(void);
 
 
diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c
index 8059c422be..887ef8b1d9 100644
--- a/epan/dissectors/packet-dlsw.c
+++ b/epan/dissectors/packet-dlsw.c
@@ -31,6 +31,9 @@
 #include <epan/packet.h>
 #include "packet-tcp.h"
 
+void proto_register_dlsw(void);
+void proto_reg_handoff_dlsw(void);
+
 static int proto_dlsw = -1;
 static int hf_dlsw_flow_control_indication = -1;
 static int hf_dlsw_flow_control_ack = -1;
diff --git a/epan/dissectors/packet-dmx-chan.c b/epan/dissectors/packet-dmx-chan.c
index 66e99c5915..ada74af4ac 100644
--- a/epan/dissectors/packet-dmx-chan.c
+++ b/epan/dissectors/packet-dmx-chan.c
@@ -42,6 +42,8 @@
 #include <epan/emem.h>
 #include <epan/prefs.h>
 
+void proto_register_dmx_chan(void);
+
 static int proto_dmx_chan = -1;
 
 static int hf_dmx_chan_output_dmx_data = -1;
diff --git a/epan/dissectors/packet-dmx-sip.c b/epan/dissectors/packet-dmx-sip.c
index 74a81b346f..dd1bd5c20e 100644
--- a/epan/dissectors/packet-dmx-sip.c
+++ b/epan/dissectors/packet-dmx-sip.c
@@ -42,6 +42,8 @@
 
 #define DMX_SC_SIP    0xCF
 
+void proto_register_dmx_sip(void);
+
 static int proto_dmx_sip = -1;
 
 static int hf_dmx_sip_byte_count = -1;
diff --git a/epan/dissectors/packet-dmx-test.c b/epan/dissectors/packet-dmx-test.c
index e17e0ab3c1..e6769b791f 100644
--- a/epan/dissectors/packet-dmx-test.c
+++ b/epan/dissectors/packet-dmx-test.c
@@ -43,6 +43,8 @@
 #define DMX_TEST_PACKET_SIZE  512
 #define DMX_TEST_VALUE       0x55
 
+void proto_register_dmx_test(void);
+
 static int proto_dmx_test = -1;
 
 static int hf_dmx_test_data = -1;
diff --git a/epan/dissectors/packet-dmx-text.c b/epan/dissectors/packet-dmx-text.c
index 29397efebd..4dedcced9e 100644
--- a/epan/dissectors/packet-dmx-text.c
+++ b/epan/dissectors/packet-dmx-text.c
@@ -40,6 +40,8 @@
 
 #include <epan/packet.h>
 
+void proto_register_dmx_text(void);
+
 static int proto_dmx_text = -1;
 
 static int hf_dmx_text_page_nr = -1;
diff --git a/epan/dissectors/packet-dmx.c b/epan/dissectors/packet-dmx.c
index db2a563e19..1aed14fd1e 100644
--- a/epan/dissectors/packet-dmx.c
+++ b/epan/dissectors/packet-dmx.c
@@ -56,6 +56,7 @@ static const value_string dmx_sc_vals[] = {
 	{ 0, NULL },
 };
 
+void proto_register_dmx(void);
 void proto_reg_handoff_dmx(void);
 
 static int proto_dmx = -1;
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index 29f8609050..bb87fbc61d 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -496,6 +496,9 @@
 /* End of Application Layer Data Object Definitions */
 /***************************************************************************/
 
+void proto_register_dnp3(void);
+void proto_reg_handoff_dnp3(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_dnp3 = -1;
 static int hf_dnp3_start = -1;
@@ -2970,7 +2973,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     /* XXX - check for dl_len <= 5 */
     data_len = dl_len - 5;
-    tmp = g_malloc(data_len);
+    tmp = (guint8 *)g_malloc(data_len);
     tmp_ptr = tmp;
     i = 0;
     data_offset = 1;  /* skip the transport layer byte when assembling chunks */
@@ -3047,10 +3050,10 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         if (!pinfo->fd->flags.visited && conv_data_ptr == NULL)
         {
           dl_conversation_key_t* new_dl_conversation_key = NULL;
-          new_dl_conversation_key  = se_alloc(sizeof(dl_conversation_key_t));
+          new_dl_conversation_key  = se_new(dl_conversation_key_t);
           *new_dl_conversation_key = dl_conversation_key;
 
-          conv_data_ptr = se_alloc(sizeof(dnp3_conv_t));
+          conv_data_ptr = se_new(dnp3_conv_t);
 
           /*** Increment static global fragment reassembly id ***/
           conv_data_ptr->conv_seq_number = seq_number++;
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 8c462694ab..5298519aa4 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -49,6 +49,9 @@
 #include <epan/expert.h>
 #include <epan/afn.h>
 
+void proto_register_dns(void);
+void proto_reg_handoff_dns(void);
+
 static int proto_dns = -1;
 static int hf_dns_length = -1;
 static int hf_dns_flags = -1;
@@ -3130,9 +3133,9 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
           goto bad_rr;
         }
         if (afamily == 1 && afdpart_len <= 4) {
-          addr_copy = se_alloc0(4);
+          addr_copy = (guint8 *)se_alloc0(4);
         } else if (afamily == 2 && afdpart_len <= 16) {
-          addr_copy = se_alloc0(16);
+          addr_copy = (guint8 *)se_alloc0(16);
         } else {
           goto bad_rr;
         }
diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c
index f90183642e..9d43cc3bb1 100644
--- a/epan/dissectors/packet-dplay.c
+++ b/epan/dissectors/packet-dplay.c
@@ -33,6 +33,9 @@
 #include <string.h>
 
 /* function declarations */
+void proto_register_dplay(void);
+void proto_reg_handoff_dplay(void);
+
 static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 static gint dissect_type1a_message(proto_tree *tree, tvbuff_t *tvb, gint offset);
 
@@ -425,7 +428,7 @@ static gint display_unicode_string(proto_tree *tree, gint hf_index, tvbuff_t *tv
      * Allocate a buffer for the string; "len" is the length in
      * bytes, not the length in characters.
      */
-    str = ep_alloc(len/2);
+    str = (char *)ep_alloc(len/2);
 
     /*
      * XXX - this assumes the string is just ISO 8859-1; we need
diff --git a/epan/dissectors/packet-dpnss-link.c b/epan/dissectors/packet-dpnss-link.c
index bf49a1ee95..66f5b54b41 100644
--- a/epan/dissectors/packet-dpnss-link.c
+++ b/epan/dissectors/packet-dpnss-link.c
@@ -33,6 +33,9 @@
 
 #include <epan/packet.h>
 
+void proto_register_dpnss_link(void);
+void proto_reg_handoff_dpnss_link(void);
+
 static dissector_handle_t dpnss_handle; /* DPNSS UI frame dissector */
 #define LINK_HEADER_SIZE 3
 
diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c
index 833f515ace..cc735e4cdb 100644
--- a/epan/dissectors/packet-dpnss.c
+++ b/epan/dissectors/packet-dpnss.c
@@ -37,6 +37,8 @@
 
 #include <epan/packet.h>
 
+void proto_register_dpnss(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_dpnss                        = -1;
 static int hf_dpnss_msg_grp_id                = -1;
diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c
index ee99ade802..b258801d3d 100644
--- a/epan/dissectors/packet-drda.c
+++ b/epan/dissectors/packet-drda.c
@@ -56,6 +56,9 @@
 #include <epan/expert.h>
 #include "packet-tcp.h"
 
+void proto_register_drda(void);
+void proto_reg_handoff_drda(void);
+
 static int proto_drda = -1;
 static int hf_drda_ddm_length = -1;
 static int hf_drda_ddm_magic = -1;
diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c
index 961fd3e3db..e765e68667 100644
--- a/epan/dissectors/packet-dsi.c
+++ b/epan/dissectors/packet-dsi.c
@@ -64,6 +64,9 @@ http://developer.apple.com/DOCUMENTATION/macos8/pdf/ASAppleTalkFiling2.1_2.2.pdf
  */
 #define INET6_ADDRLEN  16
 
+void proto_register_dsi(void);
+void proto_reg_handoff_dsi(void);
+
 static int proto_dsi = -1;
 static int hf_dsi_flags = -1;
 static int hf_dsi_command = -1;
diff --git a/epan/dissectors/packet-dtcp-ip.c b/epan/dissectors/packet-dtcp-ip.c
index 1fa74222e1..4415b59e36 100644
--- a/epan/dissectors/packet-dtcp-ip.c
+++ b/epan/dissectors/packet-dtcp-ip.c
@@ -50,6 +50,7 @@ static int proto_dtcp_ip = -1;
 
 static guint pref_tcp_port = 0;
 
+void proto_register_dtcp_ip(void);
 void proto_reg_handoff_dtcp_ip(void);
 
 static gint ett_dtcp_ip = -1;
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 639fc14118..210c9291ed 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -64,6 +64,8 @@
 #include <epan/uat.h>
 #include <epan/sctpppids.h>
 
+void proto_register_dtls(void);
+
 /* DTLS User Access Table */
 static ssldecrypt_assoc_t *dtlskeylist_uats = NULL;
 static guint ndtlsdecrypt = 0;
@@ -246,7 +248,7 @@ dtls_parse_uat(void)
   /* remove only associations created from key list */
   tmp_stack = ep_stack_new();
   g_tree_foreach(dtls_associations, ssl_assoc_from_key_list, tmp_stack);
-  while ((tmp_assoc = ep_stack_pop(tmp_stack)) != NULL) {
+  while ((tmp_assoc = (SslAssociation *)ep_stack_pop(tmp_stack)) != NULL) {
     ssl_association_remove(dtls_associations, tmp_assoc);
   }
 
@@ -414,11 +416,11 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   /* manage dtls decryption data */
   /*get a valid ssl session pointer*/
   if (conv_data != NULL)
-    ssl_session = conv_data;
+    ssl_session = (SslDecryptSession *)conv_data;
   else {
     SslService dummy;
 
-    ssl_session = se_alloc0(sizeof(SslDecryptSession));
+    ssl_session = se_new0(SslDecryptSession);
     ssl_session_init(ssl_session);
     ssl_session->version = SSL_VER_UNKNOWN;
     conversation_add_proto_data(conversation, proto_dtls, ssl_session);
@@ -439,7 +441,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
      * is not always available
      * Note that with HAVE_LIBGNUTLS undefined private_key is always 0
      * and thus decryption never engaged*/
-    private_key = g_hash_table_lookup(dtls_key_hash, &dummy);
+    private_key = (Ssl_private_key_t *)g_hash_table_lookup(dtls_key_hash, &dummy);
     if (!private_key) {
       ssl_debug_printf("dissect_dtls can't find private key for this server!\n");
     }
@@ -623,7 +625,7 @@ decrypt_dtls_record(tvbuff_t *tvb, packet_info *pinfo, guint32 offset,
       ssl_debug_printf("decrypt_dtls_record: allocating %d bytes"
                        " for decrypt data (old len %d)\n",
                        record_length + 32, dtls_decrypted_data.data_len);
-      dtls_decrypted_data.data = g_realloc(dtls_decrypted_data.data,
+      dtls_decrypted_data.data = (guchar *)g_realloc(dtls_decrypted_data.data,
                                            record_length + 32);
       dtls_decrypted_data.data_len = record_length + 32;
     }
@@ -1406,7 +1408,7 @@ dissect_dtls_handshake(tvbuff_t *tvb, packet_info *pinfo,
                 }
               }
 
-              encrypted_pre_master.data = se_alloc(encrlen);
+              encrypted_pre_master.data = (guchar *)se_alloc(encrlen);
               encrypted_pre_master.data_len = encrlen;
               tvb_memcpy(tvb, encrypted_pre_master.data, offset+skip, encrlen);
 
@@ -2261,7 +2263,7 @@ looks_like_dtls(tvbuff_t *tvb, guint32 offset)
 static void
 dtlsdecrypt_free_cb(void* r)
 {
-  ssldecrypt_assoc_t* h = r;
+  ssldecrypt_assoc_t* h = (ssldecrypt_assoc_t*)r;
 
   g_free(h->ipaddr);
   g_free(h->port);
@@ -2283,8 +2285,8 @@ dtlsdecrypt_update_cb(void* r _U_, const char** err _U_)
 static void *
 dtlsdecrypt_copy_cb(void* dest, const void* orig, size_t len _U_)
 {
-  const ssldecrypt_assoc_t* o = orig;
-  ssldecrypt_assoc_t*       d = dest;
+  const ssldecrypt_assoc_t* o = (const ssldecrypt_assoc_t*)orig;
+  ssldecrypt_assoc_t*       d = (ssldecrypt_assoc_t*)dest;
 
   d->ipaddr    = g_strdup(o->ipaddr);
   d->port      = g_strdup(o->port);
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c
index ea2488e5bb..d428fe007d 100644
--- a/epan/dissectors/packet-dtn.c
+++ b/epan/dissectors/packet-dtn.c
@@ -43,6 +43,7 @@
 #include <epan/expert.h>
 #include "packet-dtn.h"
 
+void proto_register_bundle(void);
 void proto_reg_handoff_bundle(void);
 static int dissect_primary_header(packet_info *pinfo, proto_tree *primary_tree, tvbuff_t *tvb);
 static int dissect_admin_record(proto_tree *primary_tree, tvbuff_t *tvb, int offset, int payload_length);
diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c
index 4c5e4d6180..dd51a139e2 100644
--- a/epan/dissectors/packet-dtp.c
+++ b/epan/dissectors/packet-dtp.c
@@ -38,6 +38,7 @@
  * It's incomplete, and it appears to be inaccurate in a number of places,
  * but it's all I could find....
  */
+void proto_register_dtp(void);
 
 static int proto_dtp = -1;
 static int hf_dtp_version = -1;
diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c
index ee17681b1d..e00734d054 100644
--- a/epan/dissectors/packet-dtpt.c
+++ b/epan/dissectors/packet-dtpt.c
@@ -39,6 +39,8 @@
 #include <epan/aftypes.h>
 #include <epan/ipproto.h>
 
+void proto_register_dtpt(void);
+
 static int proto_dtpt = -1;
 
 static int hf_dtpt_version = -1;
diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c
index 51d19d9714..e1905b9f07 100644
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@@ -37,6 +37,9 @@
 #include <epan/packet.h>
 #include <epan/sctpppids.h>
 
+void proto_register_dua(void);
+void proto_reg_handoff_dua(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_dua                = -1;
 static int hf_int_interface_id      = -1;
diff --git a/epan/dissectors/packet-dvb-ait.c b/epan/dissectors/packet-dvb-ait.c
index 8dc372932d..c082649a79 100644
--- a/epan/dissectors/packet-dvb-ait.c
+++ b/epan/dissectors/packet-dvb-ait.c
@@ -34,6 +34,9 @@
 #include "packet-mpeg-sect.h"
 #include "packet-mpeg-descriptor.h"
 
+void proto_register_dvb_ait(void);
+void proto_reg_handoff_dvb_ait(void);
+
 static int proto_dvb_ait = -1;
 
 static gint ett_dvb_ait       = -1;
diff --git a/epan/dissectors/packet-dvb-bat.c b/epan/dissectors/packet-dvb-bat.c
index 12b96e5355..6203d3f90c 100644
--- a/epan/dissectors/packet-dvb-bat.c
+++ b/epan/dissectors/packet-dvb-bat.c
@@ -32,6 +32,9 @@
 
 #include "packet-mpeg-descriptor.h"
 
+void proto_register_dvb_bat(void);
+void proto_reg_handoff_dvb_bat(void);
+
 static int proto_dvb_bat = -1;
 static int hf_dvb_bat_bouquet_id = -1;
 static int hf_dvb_bat_reserved1 = -1;
diff --git a/epan/dissectors/packet-dvb-data-mpe.c b/epan/dissectors/packet-dvb-data-mpe.c
index 1b795a215d..6c5790751f 100644
--- a/epan/dissectors/packet-dvb-data-mpe.c
+++ b/epan/dissectors/packet-dvb-data-mpe.c
@@ -30,6 +30,9 @@
 #include <epan/packet.h>
 #include <epan/dissectors/packet-mpeg-sect.h>
 
+void proto_register_dvb_data_mpe(void);
+void proto_reg_handoff_dvb_data_mpe(void);
+
 static int proto_dvb_data_mpe = -1;
 static int hf_dvb_data_mpe_reserved = -1;
 static int hf_dvb_data_mpe_payload_scrambling_control = -1;
diff --git a/epan/dissectors/packet-dvb-eit.c b/epan/dissectors/packet-dvb-eit.c
index c696c9aa9f..1940b39dce 100644
--- a/epan/dissectors/packet-dvb-eit.c
+++ b/epan/dissectors/packet-dvb-eit.c
@@ -32,6 +32,9 @@
 
 #include "packet-mpeg-descriptor.h"
 
+void proto_register_dvb_data_eit(void);
+void proto_reg_handoff_dvb_data_eit(void);
+
 static int proto_dvb_eit = -1;
 static int hf_dvb_eit_service_id = -1;
 static int hf_dvb_eit_reserved = -1;
diff --git a/epan/dissectors/packet-dvb-ipdc.c b/epan/dissectors/packet-dvb-ipdc.c
index c24dd73a23..cb74b69c2c 100644
--- a/epan/dissectors/packet-dvb-ipdc.c
+++ b/epan/dissectors/packet-dvb-ipdc.c
@@ -29,6 +29,8 @@
 
 #include <epan/packet.h>
 
+void proto_register_dvb_ipdc(void);
+void proto_reg_handoff_dvb_ipdc(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_ipdc = -1;
@@ -41,7 +43,7 @@ static gint ett_ipdc = -1;
 
 enum {
     DVB_IPDC_SUB_FLUTE,
-    DVB_IPDC_SUB_MAX,
+    DVB_IPDC_SUB_MAX
 };
 
 static dissector_handle_t sub_handles[DVB_IPDC_SUB_MAX];
diff --git a/epan/dissectors/packet-dvb-nit.c b/epan/dissectors/packet-dvb-nit.c
index f80db9f38c..1c525fc7fd 100644
--- a/epan/dissectors/packet-dvb-nit.c
+++ b/epan/dissectors/packet-dvb-nit.c
@@ -32,6 +32,9 @@
 
 #include "packet-mpeg-descriptor.h"
 
+void proto_register_dvb_data_nit(void);
+void proto_reg_handoff_dvb_data_nit(void);
+
 static int proto_dvb_nit = -1;
 static int hf_dvb_nit_network_id = -1;
 static int hf_dvb_nit_reserved1 = -1;
diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c
index 4dd27e6243..bc378a7f33 100644
--- a/epan/dissectors/packet-dvb-s2-bb.c
+++ b/epan/dissectors/packet-dvb-s2-bb.c
@@ -64,6 +64,8 @@ static guint8 crc8_table[256] = {
     0x84, 0x51, 0xFB, 0x2E, 0x7A, 0xAF, 0x05, 0xD0, 0xAD, 0x78, 0xD2, 0x07, 0x53, 0x86, 0x2C, 0xF9
 };
 
+void proto_register_dvb_dvb_s2_modeadapt(void);
+
 static dissector_handle_t ip_handle;
 static dissector_handle_t ipv6_handle;
 
@@ -543,7 +545,7 @@ static const range_string gse_proto_str[] = {
 #define DVB_S2_GSE_CRC32_LEN            4
 
 /* *** helper functions *** */
-gboolean check_crc8(tvbuff_t *p, guint8 len, guint8 offset, guint8 received_fcs)
+static gboolean check_crc8(tvbuff_t *p, guint8 len, guint8 offset, guint8 received_fcs)
 {
     int    i;
     guint8 crc = 0, tmp;
diff --git a/epan/dissectors/packet-dvb-sdt.c b/epan/dissectors/packet-dvb-sdt.c
index 98364d08a9..d28d2a9a25 100644
--- a/epan/dissectors/packet-dvb-sdt.c
+++ b/epan/dissectors/packet-dvb-sdt.c
@@ -32,6 +32,9 @@
 
 #include "packet-mpeg-descriptor.h"
 
+void proto_register_dvb_sdt(void);
+void proto_reg_handoff_dvb_sdt(void);
+
 static int proto_dvb_sdt = -1;
 static int hf_dvb_sdt_transport_stream_id = -1;
 static int hf_dvb_sdt_reserved1 = -1;
diff --git a/epan/dissectors/packet-dvb-tdt.c b/epan/dissectors/packet-dvb-tdt.c
index eb76308afc..f6c18077ab 100644
--- a/epan/dissectors/packet-dvb-tdt.c
+++ b/epan/dissectors/packet-dvb-tdt.c
@@ -30,6 +30,9 @@
 #include <epan/packet.h>
 #include <epan/dissectors/packet-mpeg-sect.h>
 
+void proto_register_dvb_tdt(void);
+void proto_reg_handoff_dvb_tdt(void);
+
 static int proto_dvb_tdt = -1;
 static int hf_dvb_tdt_utc_time = -1;
 
diff --git a/epan/dissectors/packet-dvb-tot.c b/epan/dissectors/packet-dvb-tot.c
index 494f521bfb..4214309b77 100644
--- a/epan/dissectors/packet-dvb-tot.c
+++ b/epan/dissectors/packet-dvb-tot.c
@@ -32,6 +32,9 @@
 
 #include "packet-mpeg-descriptor.h"
 
+void proto_register_dvb_tot(void);
+void proto_reg_handoff_dvb_tot(void);
+
 static int proto_dvb_tot = -1;
 static int hf_dvb_tot_utc_time = -1;
 static int hf_dvb_tot_reserved = -1;
diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c
index 01f4a58cef..471705c18f 100644
--- a/epan/dissectors/packet-dvmrp.c
+++ b/epan/dissectors/packet-dvmrp.c
@@ -61,6 +61,8 @@
 #include "packet-igmp.h"
 #include "packet-dvmrp.h"
 
+void proto_register_dvmrp(void);
+
 static int proto_dvmrp = -1;
 static int hf_version = -1;
 static int hf_type = -1;