From beroset:

 remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397

svn path=/trunk/; revision=48438

30 files changed, 87 insertions, 87 deletions

diff --git a/epan/asn1.c b/epan/asn1.c
index 048a3b068a..6f0e20ca6f 100644
--- a/epan/asn1.c
+++ b/epan/asn1.c
@@ -65,7 +65,7 @@ void asn1_ctx_clean_epdv(asn1_ctx_t *actx) {
 void asn1_stack_frame_push(asn1_ctx_t *actx, const gchar *name) {
   asn1_stack_frame_t *frame;
 
-  frame = ep_alloc0(sizeof(asn1_stack_frame_t));
+  frame = ep_new0(asn1_stack_frame_t);
   frame->name = name;
   frame->next = actx->stack;
   actx->stack = frame;
@@ -113,7 +113,7 @@ static asn1_par_t *push_new_par(asn1_ctx_t *actx) {
 
   DISSECTOR_ASSERT(actx->stack);
 
-  par = ep_alloc0(sizeof(asn1_par_t));
+  par = ep_new0(asn1_par_t);
 
   pp = &(actx->stack->par);
   while (*pp)
diff --git a/epan/atalk-utils.c b/epan/atalk-utils.c
index a51f9e11c4..91e62d1e70 100644
--- a/epan/atalk-utils.c
+++ b/epan/atalk-utils.c
@@ -30,7 +30,7 @@ atalk_addr_to_str(const struct atalk_ddp_addr *addrp)
 {
   gchar	*cur;
 
-  cur=ep_alloc(14);
+  cur=(gchar *)ep_alloc(14);
   atalk_addr_to_str_buf(addrp, cur, 14);
   return cur;
 }
diff --git a/epan/camel-persistentdata.c b/epan/camel-persistentdata.c
index 1e7aeae555..7f269a40cd 100644
--- a/epan/camel-persistentdata.c
+++ b/epan/camel-persistentdata.c
@@ -194,9 +194,9 @@ new_camelsrt_call(struct camelsrt_call_info_key_t *p_camelsrt_call_key)
      with the tcap transaction Id as main Key
      Once created, this entry will be updated later */
 
-  p_new_camelsrt_call_key = se_alloc(sizeof(struct camelsrt_call_info_key_t));
+  p_new_camelsrt_call_key = se_new(struct camelsrt_call_info_key_t);
   p_new_camelsrt_call_key->SessionIdKey = p_camelsrt_call_key->SessionIdKey;
-  p_new_camelsrt_call = se_alloc(sizeof(struct camelsrt_call_t));
+  p_new_camelsrt_call = se_new(struct camelsrt_call_t);
   raz_camelsrt_call(p_new_camelsrt_call);
   p_new_camelsrt_call->session_id = camelsrt_global_SessionId++;
 #ifdef DEBUG_CAMELSRT
@@ -302,7 +302,7 @@ camelsrt_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   case 64: /*EventReportSMS*/
     /* Session has been explicity closed without TC_END */
     camelsrt_close_call_matching(pinfo, p_camelsrt_info);
-    tcapsrt_close(p_camelsrt_info->tcap_context, pinfo);
+    tcapsrt_close((struct tcaphash_context_t *)p_camelsrt_info->tcap_context, pinfo);
     break;
 
   case 80: /*EventReportGPRS*/
@@ -352,7 +352,7 @@ camelsrt_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   case 66: /*ReleaseSMS*/
     /* Session has been closed by Network */
     camelsrt_close_call_matching(pinfo, p_camelsrt_info);
-    tcapsrt_close(p_camelsrt_info->tcap_context,pinfo);
+    tcapsrt_close((struct tcaphash_context_t *)p_camelsrt_info->tcap_context,pinfo);
     break;
 
   case 79: /*ReleaseGPRS*/
@@ -425,7 +425,7 @@ camelsrt_begin_call_matching(packet_info *pinfo,
     dbg(10,"New key %lu ",camelsrt_call_key.SessionIdKey);
 #endif
     p_camelsrt_call = new_camelsrt_call(&camelsrt_call_key);
-    p_camelsrt_call->tcap_context=p_camelsrt_info->tcap_context;
+    p_camelsrt_call->tcap_context=(struct tcaphash_context_t *)p_camelsrt_info->tcap_context;
     update_camelsrt_call(p_camelsrt_call, pinfo,CAMELSRT_SESSION);
 
 #ifdef DEBUG_CAMELSRT
diff --git a/epan/circuit.c b/epan/circuit.c
index daf6423685..4ea8fab477 100644
--- a/epan/circuit.c
+++ b/epan/circuit.c
@@ -115,11 +115,11 @@ circuit_new(circuit_type ctype, guint32 circuit_id, guint32 first_frame)
 	circuit_t *circuit, *old_circuit;
 	circuit_key *new_key;
 
-	new_key = se_alloc(sizeof(struct circuit_key));
+	new_key = se_new(struct circuit_key);
 	new_key->ctype = ctype;
 	new_key->circuit_id = circuit_id;
 
-	circuit = se_alloc(sizeof(circuit_t));
+	circuit = se_new(circuit_t);
 	circuit->next = NULL;
 	circuit->first_frame = first_frame;
 	circuit->last_frame = 0;	/* not known yet */
@@ -133,7 +133,7 @@ circuit_new(circuit_type ctype, guint32 circuit_id, guint32 first_frame)
 	/*
 	 * Is there already a circuit with this circuit ID?
 	 */
-	old_circuit = g_hash_table_lookup(circuit_hashtable, new_key);
+	old_circuit = (circuit_t *)g_hash_table_lookup(circuit_hashtable, new_key);
 	if (old_circuit != NULL) {
 		/*
 		 * Yes.  Find the last circuit in the list of circuits
@@ -179,7 +179,7 @@ find_circuit(circuit_type ctype, guint32 circuit_id, guint32 frame)
 	 * OK, search the list of circuits with that type and ID for
 	 * a circuit whose range of frames includes that frame number.
 	 */
-	for (circuit = g_hash_table_lookup(circuit_hashtable, &key);
+	for (circuit = (circuit_t *)g_hash_table_lookup(circuit_hashtable, &key);
 	    circuit != NULL; circuit = circuit->next) {
 		/*
 		 * The circuit includes that frame number if:
@@ -227,7 +227,7 @@ p_compare(gconstpointer a, gconstpointer b)
 void
 circuit_add_proto_data(circuit_t *conv, int proto, void *proto_data)
 {
-	circuit_proto_data *p1 = se_alloc(sizeof(circuit_proto_data));
+	circuit_proto_data *p1 = se_new(circuit_proto_data);
 
 	p1->proto = proto;
 	p1->proto_data = proto_data;
diff --git a/epan/codecs.c b/epan/codecs.c
index 5908ea2fb1..40f4926eca 100644
--- a/epan/codecs.c
+++ b/epan/codecs.c
@@ -43,7 +43,7 @@ static GHashTable *registered_codecs = NULL;
 codec_handle_t
 find_codec(const char *name)
 {
-	return (registered_codecs) ? g_hash_table_lookup(registered_codecs, name) : NULL;
+	return (registered_codecs) ? (codec_handle_t)g_hash_table_lookup(registered_codecs, name) : NULL;
 }
 
 /* Register a codec by name. */
@@ -61,7 +61,7 @@ register_codec(const char *name, codec_init_fn init_fn, codec_release_fn release
 	/* Make sure the registration is unique */
 	g_assert(g_hash_table_lookup(registered_codecs, name) == NULL);
 
-	handle = g_malloc(sizeof (struct codec_handle));
+	handle = (struct codec_handle *)g_malloc(sizeof (struct codec_handle));
 	handle->name = name;
 	handle->init_fn = init_fn;
 	handle->release_fn = release_fn;
diff --git a/epan/column-utils.c b/epan/column-utils.c
index 96b94f8a7c..0f80e4e58a 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -1458,7 +1458,7 @@ col_set_addr(packet_info *pinfo, const int col, const address *addr, const gbool
       pinfo->cinfo->col_expr.col_expr[col] = "ax25.src";
     else
       pinfo->cinfo->col_expr.col_expr[col] = "ax25.dst";
-    g_strlcpy(pinfo->cinfo->col_expr.col_expr_val[col], ax25_to_str(addr->data), COL_MAX_LEN);
+    g_strlcpy(pinfo->cinfo->col_expr.col_expr_val[col], ax25_to_str((guint8 *)addr->data), COL_MAX_LEN);
     break;
 
   case AT_ETHER:
@@ -1474,7 +1474,7 @@ col_set_addr(packet_info *pinfo, const int col, const address *addr, const gbool
       pinfo->cinfo->col_expr.col_expr[col] = "ip.src";
     else
       pinfo->cinfo->col_expr.col_expr[col] = "ip.dst";
-    ip_to_str_buf(addr->data, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN);
+    ip_to_str_buf((guint8 *)addr->data, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN);
     break;
 
   case AT_IPv6:
diff --git a/epan/conversation.c b/epan/conversation.c
index 0ceeda483e..1164769c79 100644
--- a/epan/conversation.c
+++ b/epan/conversation.c
@@ -637,7 +637,7 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address
 		}
 	}
 
-	new_key = se_alloc(sizeof(struct conversation_key));
+	new_key = se_new(struct conversation_key);
 	new_key->next = conversation_keys;
 	conversation_keys = new_key;
 	SE_COPY_ADDRESS(&new_key->addr1, addr1);
@@ -750,7 +750,7 @@ conversation_lookup_hashtable(GHashTable *hashtable, const guint32 frame_num, co
 	key.port1 = port1;
 	key.port2 = port2;
 
-	chain_head = g_hash_table_lookup(hashtable, &key);
+	chain_head = (conversation_t *)g_hash_table_lookup(hashtable, &key);
 
 	if (chain_head && (chain_head->setup_frame <= frame_num)) {
 		match = chain_head;
@@ -1135,7 +1135,7 @@ p_compare(gconstpointer a, gconstpointer b)
 void
 conversation_add_proto_data(conversation_t *conv, const int proto, void *proto_data)
 {
-	conv_proto_data *p1 = se_alloc(sizeof(conv_proto_data));
+	conv_proto_data *p1 = se_new(conv_proto_data);
 
 	p1->proto = proto;
 	p1->proto_data = proto_data;
diff --git a/epan/dissector_filters.c b/epan/dissector_filters.c
index fd29fc5d0a..fc2de01de0 100644
--- a/epan/dissector_filters.c
+++ b/epan/dissector_filters.c
@@ -36,7 +36,7 @@ GList *dissector_filter_list = NULL;
 void register_dissector_filter(const char *name, is_filter_valid_func is_filter_valid, build_filter_string_func build_filter_string) {
     dissector_filter_t *entry;
 
-    entry = g_malloc(sizeof(dissector_filter_t));
+    entry = (dissector_filter_t *)g_malloc(sizeof(dissector_filter_t));
 
     entry->name                 = name;
     entry->is_filter_valid      = is_filter_valid;
diff --git a/epan/except.c b/epan/except.c
index cb6316d8d4..719f2af1ee 100644
--- a/epan/except.c
+++ b/epan/except.c
@@ -314,7 +314,7 @@ G_GNUC_NORETURN WS_MSVC_NORETURN void except_throwd(long group, long code, const
  */
 G_GNUC_NORETURN WS_MSVC_NORETURN void except_throwf(long group, long code, const char *fmt, ...)
 {
-    char *buf = except_alloc(XCEPT_BUFFER_SIZE);
+    char *buf = (char *)except_alloc(XCEPT_BUFFER_SIZE);
     va_list vl;
 
     va_start (vl, fmt);
diff --git a/epan/expert.c b/epan/expert.c
index d80b33dc98..af547a2e3c 100644
--- a/epan/expert.c
+++ b/epan/expert.c
@@ -176,7 +176,7 @@ expert_set_info_vformat(packet_info *pinfo, proto_item *pi, int group, int sever
 	if (!tap)
 		return;
 
-	ei = ep_alloc(sizeof(expert_info_t));
+	ei = ep_new(expert_info_t);
 
 	ei->packet_num  = PINFO_FD_NUM(pinfo);
 	ei->group       = group;
diff --git a/epan/follow.c b/epan/follow.c
index 8673cd68b4..0765201bb3 100644
--- a/epan/follow.c
+++ b/epan/follow.c
@@ -115,8 +115,8 @@ build_follow_filter( packet_info *pi ) {
   /* UDP over IPv4 */
     buf = g_strdup_printf(
 	     "(ip.addr eq %s and ip.addr eq %s) and (udp.port eq %d and udp.port eq %d)",
-	     ip_to_str( pi->net_src.data),
-	     ip_to_str( pi->net_dst.data),
+	     ip_to_str((guint8 *)pi->net_src.data),
+	     ip_to_str((guint8 *)pi->net_dst.data),
 	     pi->srcport, pi->destport );
     len = 4;
     is_ipv6 = FALSE;
diff --git a/epan/frame_data.c b/epan/frame_data.c
index c7558d88aa..46a6698f9d 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -62,7 +62,7 @@ p_compare(gconstpointer a, gconstpointer b)
 void
 p_add_proto_data(frame_data *fd, int proto, void *proto_data)
 {
-  frame_proto_data *p1 = wmem_alloc(wmem_file_scope(), sizeof(frame_proto_data));
+  frame_proto_data *p1 = (frame_proto_data *)wmem_alloc(wmem_file_scope(), sizeof(frame_proto_data));
 
   p1->proto = proto;
   p1->proto_data = proto_data;
diff --git a/epan/funnel.c b/epan/funnel.c
index da768cb3ab..13cf9743db 100644
--- a/epan/funnel.c
+++ b/epan/funnel.c
@@ -50,7 +50,7 @@ void funnel_register_menu(const char *name,
                           void (*callback)(gpointer),
                           gpointer callback_data,
                           gboolean retap) {
-    funnel_menu_t* m = g_malloc(sizeof(funnel_menu_t));
+    funnel_menu_t* m = (funnel_menu_t *)g_malloc(sizeof(funnel_menu_t));
     m->name = g_strdup(name);
     m->group = group;
     m->callback = callback;
diff --git a/epan/guid-utils.c b/epan/guid-utils.c
index 0f67a56b1a..a382b0cc6e 100644
--- a/epan/guid-utils.c
+++ b/epan/guid-utils.c
@@ -153,7 +153,7 @@ guids_get_guid_name(e_guid_t *guid)
 	guidkey[0].length=4;
 	guidkey[1].length=0;
 
-	if((name = pe_tree_lookup32_array(guid_to_name_tree, &guidkey[0]))){
+	if((name = (char *)pe_tree_lookup32_array(guid_to_name_tree, &guidkey[0]))){
 		return name;
 	}
 
diff --git a/epan/h225-persistentdata.c b/epan/h225-persistentdata.c
index 8a24fd4eaf..4cb813763a 100644
--- a/epan/h225-persistentdata.c
+++ b/epan/h225-persistentdata.c
@@ -83,10 +83,10 @@ h225ras_call_t * new_h225ras_call(h225ras_call_info_key *h225ras_call_key, packe
 	   frame numbers are 1-origin, so we use 0
 	   to mean "we don't yet know in which frame
 	   the reply for this call appears". */
-	new_h225ras_call_key = se_alloc(sizeof(h225ras_call_info_key));
+	new_h225ras_call_key = se_new(h225ras_call_info_key);
 	new_h225ras_call_key->reqSeqNum = h225ras_call_key->reqSeqNum;
 	new_h225ras_call_key->conversation = h225ras_call_key->conversation;
-	h225ras_call = se_alloc(sizeof(h225ras_call_t));
+	h225ras_call = se_new(h225ras_call_t);
 	h225ras_call->req_num = pinfo->fd->num;
 	h225ras_call->rsp_num = 0;
 	h225ras_call->requestSeqNum = h225ras_call_key->reqSeqNum;
@@ -109,7 +109,7 @@ h225ras_call_t * append_h225ras_call(h225ras_call_t *prev_call, packet_info *pin
 	   frame numbers are 1-origin, so we use 0
 	   to mean "we don't yet know in which frame
 	   the reply for this call appears". */
-	h225ras_call = se_alloc(sizeof(h225ras_call_t));
+	h225ras_call = se_new(h225ras_call_t);
 	h225ras_call->req_num = pinfo->fd->num;
 	h225ras_call->rsp_num = 0;
 	h225ras_call->requestSeqNum = prev_call->requestSeqNum;
diff --git a/epan/next_tvb.c b/epan/next_tvb.c
index cbdd91554c..9297e53b60 100644
--- a/epan/next_tvb.c
+++ b/epan/next_tvb.c
@@ -40,7 +40,7 @@ void next_tvb_init(next_tvb_list_t *list) {
 void next_tvb_add_handle(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_handle_t handle) {
   next_tvb_item_t *item;
 
-  item = ep_alloc(sizeof(next_tvb_item_t));
+  item = ep_new(next_tvb_item_t);
 
   item->type = NTVB_HANDLE;
   item->handle = handle;
@@ -61,7 +61,7 @@ void next_tvb_add_handle(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree,
 void next_tvb_add_uint(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_table_t table, guint32 uint_val) {
   next_tvb_item_t *item;
 
-  item = ep_alloc(sizeof(next_tvb_item_t));
+  item = ep_new(next_tvb_item_t);
 
   item->type = NTVB_UINT;
   item->table = table;
@@ -83,7 +83,7 @@ void next_tvb_add_uint(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, d
 void next_tvb_add_string(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_table_t table, const gchar *string) {
   next_tvb_item_t *item;
 
-  item = ep_alloc(sizeof(next_tvb_item_t));
+  item = ep_new(next_tvb_item_t);
 
   item->type = NTVB_STRING;
   item->table = table;
diff --git a/epan/osi-utils.c b/epan/osi-utils.c
index d077141313..92204bfa7f 100644
--- a/epan/osi-utils.c
+++ b/epan/osi-utils.c
@@ -44,7 +44,7 @@ print_nsap_net( const guint8 *ad, int length )
 {
   gchar *cur;
 
-  cur = ep_alloc(MAX_NSAP_LEN * 3 + 50);
+  cur = (gchar *)ep_alloc(MAX_NSAP_LEN * 3 + 50);
   print_nsap_net_buf( ad, length, cur, MAX_NSAP_LEN * 3 + 50);
   return( cur );
 }
@@ -83,7 +83,7 @@ print_system_id( const guint8 *ad, int length )
 {
   gchar        *cur;
 
-  cur = ep_alloc(MAX_SYSTEMID_LEN * 3 + 5);
+  cur = (gchar *)ep_alloc(MAX_SYSTEMID_LEN * 3 + 5);
   print_system_id_buf(ad, length, cur, MAX_SYSTEMID_LEN * 3 + 5);
   return( cur );
 }
@@ -138,7 +138,7 @@ print_area(const guint8 *ad, int length)
 {
   gchar *cur;
 
-  cur = ep_alloc(MAX_AREA_LEN * 3 + 20);
+  cur = (gchar *)ep_alloc(MAX_AREA_LEN * 3 + 20);
   print_area_buf(ad, length, cur, MAX_AREA_LEN * 3 + 20);
   return cur;
 }
diff --git a/epan/prefs.c b/epan/prefs.c
index 1f8e906dcf..367dad0622 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -1509,7 +1509,7 @@ static prefs_set_pref_e column_format_set_cb(pref_t* pref, const gchar* value, g
       col_l_elt = col_l_elt->next;
 
       /* Parse the format to see if it's valid.  */
-      if (!parse_column_format(&cfmt_check, col_l_elt->data)) {
+      if (!parse_column_format(&cfmt_check, (char *)col_l_elt->data)) {
         /* It's not a valid column format.  */
         prefs_clear_string_list(col_l);
         return PREFS_SET_SYNTAX_ERR;
@@ -1537,9 +1537,9 @@ static prefs_set_pref_e column_format_set_cb(pref_t* pref, const gchar* value, g
     col_l_elt = g_list_first(col_l);
     while(col_l_elt) {
       cfmt           = g_new(fmt_data,1);
-      cfmt->title    = (gchar *)g_strdup(col_l_elt->data);
+      cfmt->title    = g_strdup((gchar *)col_l_elt->data);
       col_l_elt      = col_l_elt->next;
-      parse_column_format(cfmt, col_l_elt->data);
+      parse_column_format(cfmt, (char *)col_l_elt->data);
       cfmt->visible   = prefs_is_column_visible((gchar*)(*hidden_pref->varp.string), cfmt);
       col_l_elt      = col_l_elt->next;
       *pref->varp.list = g_list_append(*pref->varp.list, cfmt);
diff --git a/epan/range.c b/epan/range.c
index 81a1d0634e..6d692c6d6b 100644
--- a/epan/range.c
+++ b/epan/range.c
@@ -49,7 +49,7 @@ range_t *range_empty(void)
 {
    range_t *range;
 
-   range = g_malloc(RANGE_HDR_SIZE);
+   range = (range_t *)g_malloc(RANGE_HDR_SIZE);
    range->nranges = 0;
    return range;
 }
@@ -109,7 +109,7 @@ range_convert_str_work(range_t **rangep, const gchar *es, guint32 max_value,
        return CVT_SYNTAX_ERROR;
    
    /* Allocate a range; this has room for one subrange. */
-   range = g_malloc(RANGE_HDR_SIZE + sizeof (range_admin_t));
+   range = (range_t *)g_malloc(RANGE_HDR_SIZE + sizeof (range_admin_t));
    range->nranges = 0;
    nranges = 1;
 
@@ -140,7 +140,7 @@ range_convert_str_work(range_t **rangep, const gchar *es, guint32 max_value,
 	    nranges = 4;
 	 else
 	    nranges += 4;
-	 range = g_realloc(range, RANGE_HDR_SIZE +
+	 range = (range_t *)g_realloc(range, RANGE_HDR_SIZE +
 			   nranges*sizeof (range_admin_t));
       }
 
@@ -358,7 +358,7 @@ range_copy(range_t *src)
        return NULL;
    
    range_size = RANGE_HDR_SIZE + src->nranges*sizeof (range_admin_t);
-   dst = g_malloc(range_size);
+   dst = (range_t *)g_malloc(range_size);
    memcpy(dst, src, range_size);
    return dst;
 }
diff --git a/epan/sigcomp-udvm.c b/epan/sigcomp-udvm.c
index d4fbe8f2af..b2b2b82c1d 100644
--- a/epan/sigcomp-udvm.c
+++ b/epan/sigcomp-udvm.c
@@ -130,7 +130,7 @@ decompress_sigcomp_message(tvbuff_t *bytecode_tvb, tvbuff_t *message_tvb, packet
 {
 	tvbuff_t	*decomp_tvb;
 	/* UDVM memory must be initialised to zero */
-	guint8		*buff = ep_alloc0(UDVM_MEMORY_SIZE);
+	guint8		*buff = (guint8 *)ep_alloc0(UDVM_MEMORY_SIZE);
 	char		string[2];
 	guint8		*out_buff;		/* Largest allowed size for a message is UDVM_MEMORY_SIZE = 65536 */
 	guint32		i = 0;
@@ -316,7 +316,7 @@ decompress_sigcomp_message(tvbuff_t *bytecode_tvb, tvbuff_t *message_tvb, packet
 
 	}
 	/* Largest allowed size for a message is UDVM_MEMORY_SIZE = 65536  */
-	out_buff = g_malloc(UDVM_MEMORY_SIZE);
+	out_buff = (guint8 *)g_malloc(UDVM_MEMORY_SIZE);
 	/* Start executing code */
 	current_address = udvm_start_ip;
 	input_address = 0;
@@ -2666,7 +2666,7 @@ execute_next_instruction:
 			byte_copy_left = buff[64] << 8;
 			byte_copy_left = byte_copy_left | buff[65];
 			while ( n < no_of_state_create + 1 ){
-				sha1buff = g_malloc(state_length_buff[n]+8);
+				sha1buff = (guint8 *)g_malloc(state_length_buff[n]+8);
 				sha1buff[0] = state_length_buff[n] >> 8;
 				sha1buff[1] = state_length_buff[n] & 0xff;
 				sha1buff[2] = state_address_buff[n] >> 8;
diff --git a/epan/sigcomp_state_hdlr.c b/epan/sigcomp_state_hdlr.c
index 612b5de6b9..4a9887d801 100644
--- a/epan/sigcomp_state_hdlr.c
+++ b/epan/sigcomp_state_hdlr.c
@@ -628,7 +628,7 @@ sigcomp_init_udvm(void){
 	/*
 	 * Store static dictionaries in hash table
 	 */
-	sip_sdp_buff = g_malloc(SIP_SDP_STATE_LENGTH + 8);
+	sip_sdp_buff = (guint8 *)g_malloc(SIP_SDP_STATE_LENGTH + 8);
 
 	partial_state_str = bytes_to_str(sip_sdp_state_identifier, 6);
 
@@ -652,7 +652,7 @@ sigcomp_init_udvm(void){
 	 *  g_warning("g_hash_table_insert = 0x%x",sip_sdp_buff);
 	 */
 
-	presence_buff = g_malloc(PRESENCE_STATE_LENGTH + 8);
+	presence_buff = (guint8 *)g_malloc(PRESENCE_STATE_LENGTH + 8);
 
 	partial_state_str = bytes_to_str(presence_state_identifier, 6);
 
@@ -713,7 +713,7 @@ int udvm_state_access(tvbuff_t *tvb, proto_tree *tree,guint8 *buff,guint16 p_id_
 	 *	g_warning("g_hash_table_lookup = 0x%x",state_buff);
 	 * g_warning("State Access: partial state =%s",partial_state_str);
 	 */
-	state_buff = g_hash_table_lookup(state_buffer_table, partial_state_str);
+	state_buff = (guint8 *)g_hash_table_lookup(state_buffer_table, partial_state_str);
 	if ( state_buff == NULL ){
 		result_code = 2; /* No state match */
 		return result_code;
@@ -820,7 +820,7 @@ void udvm_state_create(guint8 *state_buff,guint8 *state_identifier,guint16 p_id_
 	}
 	partial_state_str = bytes_to_str(partial_state, p_id_length);
 
-	dummy_buff = g_hash_table_lookup(state_buffer_table, partial_state_str);
+	dummy_buff = (gchar *)g_hash_table_lookup(state_buffer_table, partial_state_str);
 	if ( dummy_buff == NULL ){
 		g_hash_table_insert(state_buffer_table, g_strdup(partial_state_str), state_buff);
 	}else{
diff --git a/epan/sna-utils.c b/epan/sna-utils.c
index c962285998..27ed1a70a8 100644
--- a/epan/sna-utils.c
+++ b/epan/sna-utils.c
@@ -37,7 +37,7 @@ sna_fid_to_str(const address *addr)
 {
   gchar	*cur;
 
-  cur=ep_alloc(14);
+  cur=(gchar *)ep_alloc(14);
   sna_fid_to_str_buf(addr, cur, 14);
   return cur;
 }
@@ -51,12 +51,12 @@ sna_fid_to_str_buf(const address *addr, gchar *buf, int buf_len)
   switch (addr->len) {
 
   case 1:
-    addrdata = addr->data;
+    addrdata = (guint8 *)addr->data;
     g_snprintf(buf, buf_len, "%04X", addrdata[0]);
     break;
 
   case 2:
-    addrdata = addr->data;
+    addrdata = (guint8 *)addr->data;
     g_snprintf(buf, buf_len, "%04X", pntohs(&addrdata[0]));
     break;
 
diff --git a/epan/stat_cmd_args.c b/epan/stat_cmd_args.c
index 5b7519ee50..c85f271ee3 100644
--- a/epan/stat_cmd_args.c
+++ b/epan/stat_cmd_args.c
@@ -67,7 +67,7 @@ register_stat_cmd_arg(const char *cmd, void (*func)(const char*, void*),void* us
 {
 	stat_cmd_arg *newsca;
 
-	newsca=g_malloc(sizeof(stat_cmd_arg));
+	newsca=(stat_cmd_arg *)g_malloc(sizeof(stat_cmd_arg));
 	newsca->cmd=cmd;
 	newsca->func=func;
 	newsca->userdata=userdata;
@@ -86,9 +86,9 @@ process_stat_cmd_arg(char *optstr)
 	stat_requested *tr;
 
 	for(entry=stat_cmd_arg_list;entry;entry=g_slist_next(entry)){
-		sca=entry->data;
+		sca=(stat_cmd_arg *)entry->data;
 		if(!strncmp(sca->cmd,optstr,strlen(sca->cmd))){
-			tr=g_malloc(sizeof (stat_requested));
+			tr=(stat_requested *)g_malloc(sizeof (stat_requested));
 			tr->sca = sca;
 			tr->arg=g_strdup(optstr);
 			stats_requested=g_slist_append(stats_requested, tr);
@@ -108,7 +108,7 @@ list_stat_cmd_args(void)
 	stat_cmd_arg *sca;
 
 	for(entry=stat_cmd_arg_list;entry;entry=g_slist_next(entry)){
-		sca=entry->data;
+		sca=(stat_cmd_arg *)entry->data;
 		fprintf(stderr,"     %s\n",sca->cmd);
 	}
 }
@@ -122,7 +122,7 @@ start_requested_stats(void)
 	stat_requested *sr;
 
 	while(stats_requested){
-		sr=stats_requested->data;
+		sr=(stat_requested *)stats_requested->data;
 		(*sr->sca->func)(sr->arg,sr->sca->userdata);
 		g_free(sr->arg);
 		g_free(sr);
diff --git a/epan/tap.c b/epan/tap.c
index 88b4236522..7ac5e54bc6 100644
--- a/epan/tap.c
+++ b/epan/tap.c
@@ -123,7 +123,7 @@ register_tap(const char *name)
 			return tap_id;
 	}
 
-	td=g_malloc(sizeof(tap_dissector_t));
+	td=(tap_dissector_t *)g_malloc(sizeof(tap_dissector_t));
 	td->next=NULL;
 	td->name = g_strdup(name);
 
@@ -399,7 +399,7 @@ register_tap_listener(const char *tapname, void *tapdata, const char *fstring,
 		return error_string;
 	}
 
-	tl=g_malloc(sizeof(tap_listener_t));
+	tl=(tap_listener_t *)g_malloc(sizeof(tap_listener_t));
 	tl->code=NULL;
 	tl->needs_redraw=TRUE;
 	tl->flags=flags;
diff --git a/epan/value_string.c b/epan/value_string.c
index 61e9ee7e88..77d65819ab 100644
--- a/epan/value_string.c
+++ b/epan/value_string.c
@@ -136,7 +136,7 @@ value_string_ext_new(value_string *vs, guint vs_tot_num_entries, const gchar *vs
     g_assert (vs_name != NULL);
     g_assert (vs_tot_num_entries > 0);
     g_assert (vs[vs_tot_num_entries-1].strptr == NULL); /* Null-terminated value-string ? */
-    vse                  = g_malloc(sizeof (value_string_ext));
+    vse                  = (value_string_ext *)g_malloc(sizeof (value_string_ext));
     vse->_vs_p           = vs;
     vse->_vs_num_entries = vs_tot_num_entries - 1; /* remember the actual number of entries */
     vse->_vs_first_value = 0;                      /* initialized in _match_strval_ext_init */
diff --git a/epan/wmem/wmem_allocator_block.c b/epan/wmem/wmem_allocator_block.c
index 0ccbc4d45b..119302e3ed 100644
--- a/epan/wmem/wmem_allocator_block.c
+++ b/epan/wmem/wmem_allocator_block.c
@@ -474,17 +474,17 @@ wmem_block_split_free_chunk(wmem_block_allocator_t *allocator,
              * then update anything that may have pointed to it to point to the
              * new address instead */
             wmem_block_chunk_t *prev, *next;
-            wmem_block_free_t  *old, *new;
+            wmem_block_free_t  *old_blk, *new_blk;
 
-            old = WMEM_GET_FREE(chunk);
-            new = WMEM_GET_FREE(extra);
+            old_blk = WMEM_GET_FREE(chunk);
+            new_blk = WMEM_GET_FREE(extra);
 
-            prev = old->prev;
-            next = old->next;
+            prev = old_blk->prev;
+            next = old_blk->next;
 
-            new->in_free_list = TRUE;
-            new->prev = prev;
-            new->next = next;
+            new_blk->in_free_list = TRUE;
+            new_blk->prev = prev;
+            new_blk->next = next;
 
             if (prev) WMEM_GET_FREE(prev)->next = extra;
             if (next) WMEM_GET_FREE(next)->prev = extra;
diff --git a/epan/wmem/wmem_allocator_strict.c b/epan/wmem/wmem_allocator_strict.c
index 783916bdbb..45ba002de4 100644
--- a/epan/wmem/wmem_allocator_strict.c
+++ b/epan/wmem/wmem_allocator_strict.c
@@ -77,7 +77,7 @@ static void
 wmem_strict_ghash_check_canaries(gpointer key _U_, gpointer value,
         gpointer user_data _U_)
 {
-    wmem_strict_block_check_canaries(value);
+    wmem_strict_block_check_canaries((wmem_strict_allocator_block_t *)value);
 }
 
 static void
@@ -93,7 +93,7 @@ wmem_strict_block_free(wmem_strict_allocator_block_t *block)
 static void
 wmem_strict_ghash_block_free(gpointer data)
 {
-    wmem_strict_block_free(data);
+    wmem_strict_block_free((wmem_strict_allocator_block_t *)data);
 }
 
 static wmem_strict_allocator_block_t *
@@ -104,7 +104,7 @@ wmem_strict_block_new(const size_t size)
     block = g_slice_new(wmem_strict_allocator_block_t);
 
     block->data_len        = size;
-    block->leading_canary  = g_malloc(block->data_len + (2 * WMEM_CANARY_SIZE));
+    block->leading_canary  = (guint8 *)g_malloc(block->data_len + (2 * WMEM_CANARY_SIZE));
     block->real_data       = block->leading_canary + WMEM_CANARY_SIZE;
     block->trailing_canary = block->real_data + block->data_len;
 
@@ -143,7 +143,7 @@ wmem_strict_free(void *private_data, void *ptr)
     
     allocator = (wmem_strict_allocator_t*) private_data;
 
-    block = g_hash_table_lookup(allocator->block_table, ptr);
+    block = (wmem_strict_allocator_block_t *)g_hash_table_lookup(allocator->block_table, ptr);
 
     g_assert(block);
 
@@ -162,7 +162,7 @@ wmem_strict_realloc(void *private_data, void *ptr, const size_t size)
     allocator = (wmem_strict_allocator_t*) private_data;
 
     /* retrieve and check the old block */
-    block = g_hash_table_lookup(allocator->block_table, ptr);
+    block = (wmem_strict_allocator_block_t *)g_hash_table_lookup(allocator->block_table, ptr);
     g_assert(block);
     wmem_strict_block_check_canaries(block);
     
diff --git a/epan/wmem/wmem_slist.c b/epan/wmem/wmem_slist.c
index d4341359f2..a855d2ddba 100644
--- a/epan/wmem/wmem_slist.c
+++ b/epan/wmem/wmem_slist.c
@@ -99,14 +99,14 @@ wmem_slist_remove(wmem_slist_t *slist, void *data)
 void
 wmem_slist_prepend(wmem_slist_t *slist, void *data)
 {
-    wmem_slist_frame_t *new;
+    wmem_slist_frame_t *new_frame;
 
-    new = wmem_new(slist->allocator, wmem_slist_frame_t);
+    new_frame = wmem_new(slist->allocator, wmem_slist_frame_t);
 
-    new->data = data;
-    new->next = slist->front;
+    new_frame->data = data;
+    new_frame->next = slist->front;
 
-    slist->front = new;
+    slist->front = new_frame;
     slist->count++;
 }
 
diff --git a/epan/wmem/wmem_strbuf.c b/epan/wmem/wmem_strbuf.c
index b0dff00bcd..8ee49b368b 100644
--- a/epan/wmem/wmem_strbuf.c
+++ b/epan/wmem/wmem_strbuf.c
@@ -58,16 +58,16 @@ wmem_strbuf_sized_new(wmem_allocator_t *allocator,
 {
     wmem_strbuf_t *strbuf;
 
-    g_assert(alloc_len <= max_len);
+    g_assert((max_len == 0) || (alloc_len <= max_len));
 
-    strbuf = wmem_alloc(allocator, sizeof(wmem_strbuf_t));
+    strbuf = (wmem_strbuf_t *)wmem_alloc(allocator, sizeof(wmem_strbuf_t));
 
     strbuf->allocator = allocator;
     strbuf->len       = 0;
     strbuf->alloc_len = alloc_len ? alloc_len : DEFAULT_MINIMUM_LEN;
     strbuf->max_len   = max_len;
 
-    strbuf->str    = wmem_alloc(strbuf->allocator, strbuf->alloc_len);
+    strbuf->str    = (gchar *)wmem_alloc(strbuf->allocator, strbuf->alloc_len);
     strbuf->str[0] = '\0';
 
     return strbuf;
@@ -119,7 +119,7 @@ wmem_strbuf_grow(wmem_strbuf_t *strbuf, const gsize to_add)
         return;
     }
 
-    strbuf->str = wmem_realloc(strbuf->allocator, strbuf->str, new_alloc_len);
+    strbuf->str = (gchar *)wmem_realloc(strbuf->allocator, strbuf->str, new_alloc_len);
 
     strbuf->alloc_len = new_alloc_len;
 }
diff --git a/epan/wmem/wmem_strutl.c b/epan/wmem/wmem_strutl.c
index 958c1ebc09..99d13325e8 100644
--- a/epan/wmem/wmem_strutl.c
+++ b/epan/wmem/wmem_strutl.c
@@ -47,7 +47,7 @@ wmem_strdup(wmem_allocator_t *allocator, const gchar *src)
 
     len = strlen(src) + 1; /* +1 for the null-terminator */
 
-    return memcpy(wmem_alloc(allocator, len), src, len);
+    return (gchar *)memcpy(wmem_alloc(allocator, len), src, len);
 }
 
 gchar *
@@ -56,7 +56,7 @@ wmem_strndup(wmem_allocator_t *allocator, const gchar *src, const size_t len)
     gchar *dst;
     guint i;
 
-    dst = wmem_alloc(allocator, len+1);
+    dst = (gchar *)wmem_alloc(allocator, len+1);
 
     for (i=0; (i < len) && src[i]; i++) {
         dst[i] = src[i];
@@ -91,7 +91,7 @@ wmem_strdup_vprintf(wmem_allocator_t *allocator, const gchar *fmt, va_list ap)
 
     len = g_printf_string_upper_bound(fmt, ap);
 
-    dst = wmem_alloc(allocator, len+1);
+    dst = (gchar *)wmem_alloc(allocator, len+1);
     g_vsnprintf(dst, (gulong) len, fmt, ap2);
     va_end(ap2);