[-Wmissing-prototypes]

Use explicit casts.

svn path=/trunk/; revision=48338

16 files changed, 60 insertions, 33 deletions

diff --git a/epan/asm_utils.c b/epan/asm_utils.c
index 7eef29e4ba..a1b2587d22 100644
--- a/epan/asm_utils.c
+++ b/epan/asm_utils.c
@@ -65,7 +65,7 @@ guint
 wrs_str_hash(gconstpointer v)
 {
   /* 31 bit hash function */
-  const signed char *p = v;
+  const signed char *p = (const signed char *)v;
   guint32 h = *p;
   if (h)
     for (p += 1; *p != '\0'; p++)
diff --git a/epan/diam_dict.l b/epan/diam_dict.l
index 156a011b63..183b19fefa 100644
--- a/epan/diam_dict.l
+++ b/epan/diam_dict.l
@@ -209,7 +209,7 @@ description_attr description=\042
 <LOADING>{xmlpi_start} BEGIN LOADING_XMLPI;
 <LOADING_XMLPI>{whitespace} ;
 <LOADING_XMLPI>{entityname} {
-	xmlpi = g_malloc(sizeof(ddict_xmlpi_t));
+	xmlpi = g_new(ddict_xmlpi_t,1);
 	xmlpi->name = g_strdup(yytext);
 	xmlpi->key = NULL;
 	xmlpi->value = NULL;
@@ -233,7 +233,7 @@ description_attr description=\042
 
 <LOADING>{start_entity} BEGIN ENTITY;
 <ENTITY>{entityname} {
-	entity_t* e = g_malloc(sizeof(entity_t));
+	entity_t* e = g_new(entity_t,1);
 	e->name = strdup(yytext);
 	e->next = ents.next;
 	ents.next = e;
@@ -361,7 +361,7 @@ description_attr description=\042
 <IN_DICT>{application_start} {
 	D(("application_start\n"));
 
-	appl = g_malloc(sizeof(ddict_application_t));
+	appl = g_new(ddict_application_t,1);
 	appl->name = NULL;
 	appl->code = 0;
 	appl->next = NULL;
@@ -383,7 +383,7 @@ description_attr description=\042
 <IN_APPL>{command_start}		{
 	D(("command_start\n"));
 
-	cmd = g_malloc(sizeof(ddict_cmd_t));
+	cmd = g_new(ddict_cmd_t,1);
 	cmd->name = NULL;
 	cmd->vendor = NULL;
 	cmd->code = 0;
@@ -404,7 +404,7 @@ description_attr description=\042
 <IN_APPL>{vendor_start} {
 	D(("vendor_start\n"));
 
-	vnd = g_malloc(sizeof(ddict_vendor_t));
+	vnd = g_new(ddict_vendor_t,1);
 	vnd->name = NULL;
 	vnd->code = 0;
 	vnd->next = NULL;
@@ -424,7 +424,7 @@ description_attr description=\042
 <IN_APPL>{typedefn_start} {
 	D(("typedefn_start\n"));
 
-	typedefn = g_malloc(sizeof(ddict_typedefn_t));
+	typedefn = g_new(ddict_typedefn_t,1);
 	typedefn->name = NULL;
 	typedefn->parent = NULL;
 	typedefn->next = NULL;
@@ -444,7 +444,7 @@ description_attr description=\042
 <IN_APPL>{avp_start}	{
 	D(("avp_start\n"));
 
-	avp = g_malloc(sizeof(ddict_avp_t));
+	avp = g_new(ddict_avp_t,1);
 	avp->name = NULL;
 	avp->description = NULL;
 	avp->vendor = NULL;
@@ -477,7 +477,7 @@ description_attr description=\042
 <IN_AVP>{gavp_start} {
 	D(("gavp_start\n"));
 
-	gavp = g_malloc(sizeof(ddict_gavp_t));
+	gavp = g_new(ddict_gavp_t,1);
 	gavp->name = NULL;
 	gavp->code = 0;
 	gavp->next = NULL;
@@ -495,7 +495,7 @@ description_attr description=\042
 <IN_AVP>{enum_start} {
 	D(("enum_start\n"));
 
-	enumitem = g_malloc(sizeof(ddict_enum_t));
+	enumitem = g_new(ddict_enum_t,1);
 	enumitem->name = NULL;
 	enumitem->code = 0;
 	enumitem->next = NULL;
@@ -563,11 +563,11 @@ void ddict_unused(void) {
 static void append_to_buffer(const char* txt, int len) {
 
 	if (strbuf == NULL) {
-		read_ptr = write_ptr = strbuf = g_malloc(size_strbuf);
+		read_ptr = write_ptr = strbuf = (char*)g_malloc(size_strbuf);
 	}
 
 	if ( (len_strbuf + len) >= size_strbuf ) {
-		read_ptr = strbuf = g_realloc(strbuf,size_strbuf *= 2);
+		read_ptr = strbuf = (char*)g_realloc(strbuf,size_strbuf *= 2);
 	}
 
 	write_ptr = strbuf + len_strbuf;
@@ -640,7 +640,7 @@ ddict_t* ddict_scan(const char* system_directory, const char* filename, int dbg)
 	write_ptr = NULL;
 	read_ptr = NULL;
 
-	dict = g_malloc(sizeof(ddict_t));
+	dict = g_new(ddict_t,1);
 	dict->applications = NULL;
 	dict->cmds = NULL;
 	dict->vendors = NULL;
diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c
index 58445deeaa..c387f7aff8 100644
--- a/epan/dissectors/packet-ctdb.c
+++ b/epan/dissectors/packet-ctdb.c
@@ -31,6 +31,9 @@
 #include <epan/expert.h>
 #include <epan/emem.h>
 
+void proto_register_ctdb(void);
+void proto_reg_handoff_ctdb(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_ctdb = -1;
 static int hf_ctdb_length = -1;
@@ -616,7 +619,7 @@ dissect_ctdb_reply_dmaster(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr
 	tkey[1].length=1;
 	tkey[1].key=&dst;
 	tkey[2].length=0;
-	ctdb_trans=se_tree_lookup32_array(ctdb_transactions, &tkey[0]);
+	ctdb_trans=(ctdb_trans_t *)se_tree_lookup32_array(ctdb_transactions, &tkey[0]);
 
 	if(ctdb_trans){
 		ctdb_trans->response_in=pinfo->fd->num;
@@ -682,7 +685,7 @@ dissect_ctdb_req_dmaster(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
 	tkey[1].length=1;
 	tkey[1].key=&dmaster;
 	tkey[2].length=0;
-	ctdb_trans=se_tree_lookup32_array(ctdb_transactions, &tkey[0]);
+	ctdb_trans=(ctdb_trans_t *)se_tree_lookup32_array(ctdb_transactions, &tkey[0]);
 
 	if(ctdb_trans){
 		ctdb_display_trans(pinfo, tree, tvb, ctdb_trans);
@@ -748,7 +751,7 @@ dissect_ctdb_req_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
 	if(!pinfo->fd->flags.visited){
 		emem_tree_key_t tkey[4];
 
-		ctdb_control=se_alloc(sizeof(ctdb_control_t));
+		ctdb_control=se_new(ctdb_control_t);
 		ctdb_control->opcode=opcode;
 		ctdb_control->request_in=pinfo->fd->num;
 		ctdb_control->response_in=0;
@@ -772,7 +775,7 @@ dissect_ctdb_req_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
 		tkey[2].length=1;
 		tkey[2].key=&dst;
 		tkey[3].length=0;
-		ctdb_control=se_tree_lookup32_array(ctdb_controls, &tkey[0]);
+		ctdb_control=(ctdb_control_t *)se_tree_lookup32_array(ctdb_controls, &tkey[0]);
 	}
 
 
@@ -803,7 +806,7 @@ dissect_ctdb_reply_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr
 	tkey[2].length=1;
 	tkey[2].key=&src;
 	tkey[3].length=0;
-	ctdb_control=se_tree_lookup32_array(ctdb_controls, &tkey[0]);
+	ctdb_control=(ctdb_control_t *)se_tree_lookup32_array(ctdb_controls, &tkey[0]);
 
 	if(!ctdb_control){
 		return offset;
@@ -938,7 +941,7 @@ dissect_ctdb_req_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 	if(!pinfo->fd->flags.visited){
 		emem_tree_key_t tkey[3];
 
-		ctdb_trans=se_alloc(sizeof(ctdb_trans_t));
+		ctdb_trans=se_new(ctdb_trans_t);
 		ctdb_trans->key_hash=keyhash;
 		ctdb_trans->request_in=pinfo->fd->num;
 		ctdb_trans->response_in=0;
@@ -958,7 +961,7 @@ dissect_ctdb_req_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 		tkey[1].length=1;
 		tkey[1].key=&caller;
 		tkey[2].length=0;
-		ctdb_trans=se_tree_lookup32_array(ctdb_transactions, &tkey[0]);
+		ctdb_trans=(ctdb_trans_t *)se_tree_lookup32_array(ctdb_transactions, &tkey[0]);
 	}
 
 	if(ctdb_trans){
diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c
index c9763712ce..16fa9b3af2 100644
--- a/epan/dissectors/packet-cups.c
+++ b/epan/dissectors/packet-cups.c
@@ -33,6 +33,9 @@
 
 /**********************************************************************/
 
+void proto_register_cups(void);
+void proto_reg_handoff_cups(void);
+
 /* From cups/cups.h, GNU GPL, Copyright 1997-2001 by Easy Software Products. */
 typedef guint32 cups_ptype_t;           /**** Printer Type/Capability Bits ****/
 enum                                    /* Not a typedef'd enum so we can OR */
diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c
index 8af948d92e..cf49d4cff9 100644
--- a/epan/dissectors/packet-daap.c
+++ b/epan/dissectors/packet-daap.c
@@ -213,6 +213,9 @@
 #define daap_asdp ("daap.songdatepurchased")
 */
 
+void proto_register_daap(void);
+void proto_reg_handoff_daap(void);
+
 static dissector_handle_t png_handle;
 
 /*XXX: Sorted by value definition since it appears that the "value" is just */
diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c
index 6e9370a6ea..3b32ec1580 100644
--- a/epan/dissectors/packet-data.c
+++ b/epan/dissectors/packet-data.c
@@ -33,6 +33,8 @@
 /* proto_data cannot be static because it's referenced in the
  * print routines
  */
+void proto_register_data(void);
+
 int proto_data = -1;
 
 static int hf_data_data = -1;
@@ -58,7 +60,7 @@ dissect_data(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree)
 			proto_item *ti;
 			proto_tree *data_tree;
 			if (new_pane) {
-				guint8 *real_data = tvb_memdup(tvb, 0, bytes);
+				guint8 *real_data = (guint8 *)tvb_memdup(tvb, 0, bytes);
 				data_tvb = tvb_new_child_real_data(tvb,real_data,bytes,bytes);
 				tvb_set_free_cb(data_tvb, g_free);
 				add_new_data_source(pinfo, data_tvb, "Not dissected data bytes");
diff --git a/epan/dissectors/packet-daytime.c b/epan/dissectors/packet-daytime.c
index d9c62d967a..5dfd7a3961 100644
--- a/epan/dissectors/packet-daytime.c
+++ b/epan/dissectors/packet-daytime.c
@@ -29,6 +29,9 @@
 
 #include <epan/packet.h>
 
+void proto_register_daytime(void);
+void proto_reg_handoff_daytime(void);
+
 static int proto_daytime = -1;
 static int hf_daytime_string = -1;
 
diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c
index 72b03c3bfe..167c40ba9f 100644
--- a/epan/dissectors/packet-db-lsp.c
+++ b/epan/dissectors/packet-db-lsp.c
@@ -46,6 +46,9 @@
 
 #define DB_LSP_PORT  17500
 
+void proto_register_db_lsp(void);
+void proto_reg_handoff_db_lsp(void);
+
 static int proto_db_lsp = -1;
 static int proto_db_lsp_disc = -1;
 
diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c
index 36c7f04002..ceefac7a03 100644
--- a/epan/dissectors/packet-dbus.c
+++ b/epan/dissectors/packet-dbus.c
@@ -32,6 +32,9 @@
 #include <epan/expert.h>
 #include <epan/dissectors/packet-tcp.h>
 
+void proto_register_dbus(void);
+void proto_reg_handoff_dbus(void);
+
 static gboolean dbus_desegment = TRUE;
 
 static int hf_dbus_hdr = -1;
diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c
index a13b14fcb3..e9c93910dd 100644
--- a/epan/dissectors/packet-dcc.c
+++ b/epan/dissectors/packet-dcc.c
@@ -34,6 +34,9 @@
 
 #include <packet-dcc.h>
 
+void proto_register_dcc(void);
+void proto_reg_handoff_dcc(void);
+
 static int proto_dcc = -1;
 static int hf_dcc_len = -1;
 static int hf_dcc_pkt_vers = -1;
diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c
index 2c09ec7355..40e56e7d8c 100644
--- a/epan/dissectors/packet-dccp.c
+++ b/epan/dissectors/packet-dccp.c
@@ -79,6 +79,9 @@
 #define DCCP_HDR_LEN_MAX (DCCP_HDR_LEN + DCCP_HDR_PKT_TYPES_LEN_MAX + \
                           DCCP_OPT_LEN_MAX)
 
+void proto_register_dccp(void);
+void proto_reg_handoff_dccp(void);
+
 /*
  * FF: please keep this list in sync with
  * http://www.iana.org/assignments/dccp-parameters/dccp-parameters.xml
@@ -629,7 +632,7 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
     guint      options_len                = 0;
     e_dccphdr *dccph;
 
-    dccph = ep_alloc0(sizeof (e_dccphdr));
+    dccph = ep_new0(e_dccphdr);
 
     SET_ADDRESS(&dccph->ip_src, pinfo->src.type, pinfo->src.len,
                 pinfo->src.data);
@@ -718,9 +721,9 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
             * reassembly? */
         if (dccp_check_checksum) {
             /* Set up the fields of the pseudo-header. */
-            cksum_vec[0].ptr = pinfo->src.data;
+            cksum_vec[0].ptr = (const guint8 *)pinfo->src.data;
             cksum_vec[0].len = pinfo->src.len;
-            cksum_vec[1].ptr = pinfo->dst.data;
+            cksum_vec[1].ptr = (const guint8 *)pinfo->dst.data;
             cksum_vec[1].len = pinfo->dst.len;
             cksum_vec[2].ptr = (const guint8 *) &phdr;
             switch (pinfo->src.type) {
diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c
index a0c998c550..3fb9cfcf29 100644
--- a/epan/dissectors/packet-dcp-etsi.c
+++ b/epan/dissectors/packet-dcp-etsi.c
@@ -36,7 +36,8 @@
 #include <string.h>
 
 /* forward reference */
-
+void proto_register_dcp_etsi(void);
+void proto_reg_handoff_dcp_etsi(void);
 static void dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree);
 static void dissect_pft (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree);
 static void dissect_tpl(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree);
@@ -288,7 +289,7 @@ dissect_pft_fec_detailed(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
       proto_tree_add_text (tree, tvb, 0, -1, "want %d, got %d need %d",
                            fcount, fragments, rx_min
         );
-    got = ep_alloc(fcount*sizeof(guint32));
+    got = (guint32 *)ep_alloc(fcount*sizeof(guint32));
 
     /* make a list of the findex (offset) numbers of the fragments we have */
     fd = fragment_get(pinfo, seq, dcp_fragment_table);
diff --git a/epan/dtd_grammar.lemon b/epan/dtd_grammar.lemon
index 704a1f53b3..393157f117 100644
--- a/epan/dtd_grammar.lemon
+++ b/epan/dtd_grammar.lemon
@@ -36,7 +36,7 @@
 #include "dtd_parse.h"
 
 static dtd_named_list_t* dtd_named_list_new(gchar* name, GPtrArray* list) {
-	dtd_named_list_t* nl = g_malloc(sizeof(dtd_named_list_t));
+	dtd_named_list_t* nl = g_new(dtd_named_list_t,1);
 
 	nl->name = name;
 	nl->list = list;
@@ -107,7 +107,7 @@ doctype ::= TAG_START DOCTYPE_KW NAME(Name) OPEN_BRACKET dtd_parts CLOSE_BRACKET
 	bd->proto_name = name;
     
     for( i = 0; i< bd->elements->len; i++) {
-        dtd_named_list_t* el = g_ptr_array_index(bd->elements,i);
+        dtd_named_list_t* el = (dtd_named_list_t*)g_ptr_array_index(bd->elements,i);
         
         g_ptr_array_add(root_elems,g_strdup(el->name));
     }
diff --git a/epan/dtd_parse.l b/epan/dtd_parse.l
index 5a0b219a05..ef0b313ff1 100644
--- a/epan/dtd_parse.l
+++ b/epan/dtd_parse.l
@@ -301,7 +301,7 @@ squoted        ['][^\']*[']
 %%
 
 static dtd_token_data_t* new_token(gchar* text) {
-	dtd_token_data_t* t = g_malloc(sizeof(dtd_token_data_t));
+	dtd_token_data_t* t = g_new(dtd_token_data_t,1);
 
 	t->text = g_strdup(text);
 	t->location = g_strdup(location);
@@ -338,7 +338,7 @@ extern dtd_build_data_t* dtd_parse(GString* s) {
 	DtdParseTrace(stderr, ">>");
 #endif
 
-	build_data = g_malloc(sizeof(dtd_build_data_t));
+	build_data = g_new(dtd_build_data_t,1);
 
 	build_data->proto_name = NULL;
 	build_data->media_type = NULL;
diff --git a/epan/dtd_preparse.l b/epan/dtd_preparse.l
index 4265538ded..087706fa19 100644
--- a/epan/dtd_preparse.l
+++ b/epan/dtd_preparse.l
@@ -169,7 +169,7 @@ static const gchar* replace_entity(gchar* entity) {
 
 	*entity = '%';
 
-	replacement = g_hash_table_lookup(entities,entity);
+	replacement = (GString*)g_hash_table_lookup(entities,entity);
 
 	if (replacement) {
 		return replacement->str;
@@ -192,7 +192,7 @@ static const gchar* location(void) {
 
 static gboolean free_gstring_hash_items(gpointer k,gpointer v,gpointer p _U_) {
 	g_free(k);
-	g_string_free(v,TRUE);
+	g_string_free((GString*)v,TRUE);
 	return TRUE;
 }
 
diff --git a/epan/xdlc.c b/epan/xdlc.c
index 9ca6c4db94..f1a6e0f2de 100644
--- a/epan/xdlc.c
+++ b/epan/xdlc.c
@@ -244,7 +244,7 @@ dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo,
     const gchar *frame_type = NULL;
     const gchar *modifier;
 
-    info=ep_alloc(80);
+    info=(char *)ep_alloc(80);
     switch (tvb_get_guint8(tvb, offset) & 0x03) {
 
     case XDLC_S: