From Sebastien Tandel

fixes for various compiler warnings

svn path=/trunk/; revision=21210

30 files changed, 216 insertions, 198 deletions

diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c
index a81d3b31d1..582c1cc982 100644
--- a/epan/dissectors/packet-alcap.c
+++ b/epan/dissectors/packet-alcap.c
@@ -540,7 +540,7 @@ static gchar* dissect_fields_desea(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
     
     e164->e164_number_type = CALLED_PARTY_NUMBER;
     e164->nature_of_address = tvb_get_guint8(tvb,offset) & 0x7f;
-    e164->E164_number_str = tvb_get_ephemeral_string(tvb,offset+1,len);
+    e164->E164_number_str = (gchar*)tvb_get_ephemeral_string(tvb,offset+1,len);
     e164->E164_number_length = len-1;
     
     dissect_e164_number(tvb, tree, offset-1, len, *e164);
@@ -567,7 +567,7 @@ static gchar* dissect_fields_oesea(packet_info* pinfo _U_, tvbuff_t *tvb, proto_
     
     e164->e164_number_type = CALLING_PARTY_NUMBER;
     e164->nature_of_address = tvb_get_guint8(tvb,offset) & 0x7f;
-    e164->E164_number_str = tvb_get_ephemeral_string(tvb,offset+1,len);
+    e164->E164_number_str = (gchar*)tvb_get_ephemeral_string(tvb,offset+1,len);
     e164->E164_number_length = len-1;
     
     dissect_e164_number(tvb, tree, offset-1, len, *e164);
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index 298ed6387e..5c805c765e 100644
--- a/epan/dissectors/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
@@ -1124,7 +1124,7 @@ trans_param_address(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset,
 	    else
 	    {
 		proto_tree_add_bytes(tree, hf_ansi_637_bin_addr, tvb, offset, num_fields - 1,
-		    ansi_637_bigbuf);
+		    (guint8*)ansi_637_bigbuf);
 	    }
 
 	    offset += (num_fields - 1);
@@ -1372,7 +1372,7 @@ trans_param_subaddress(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offse
     ansi_637_bigbuf[i] = '\0';
 
     proto_tree_add_bytes(tree, hf_ansi_637_bin_addr, tvb, offset, num_fields - 1,
-	ansi_637_bigbuf);
+	(guint8*)ansi_637_bigbuf);
 
     offset += (num_fields - 1);
 
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index cdf4ae92c8..9d0eb5d06e 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -3586,9 +3586,9 @@ elem_clg_party_ascii_num(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint
 
     proto_tree_add_string_format(tree, hf_ansi_a_clg_party_ascii_num,
 	tvb, curr_offset, len - (curr_offset - offset),
-	poctets,
+	(gchar*)poctets,
 	"Digits: %s",
-	format_text(poctets, len - (curr_offset - offset)));
+	(gchar*)format_text(poctets, len - (curr_offset - offset)));
 
     curr_offset += len - (curr_offset - offset);
 
@@ -6902,9 +6902,9 @@ elem_cld_party_ascii_num(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint
 
     proto_tree_add_string_format(tree, hf_ansi_a_cld_party_ascii_num,
 	tvb, curr_offset, len - (curr_offset - offset),
-	poctets,
+	(gchar*)poctets,
 	"Digits: %s",
-	format_text(poctets, len - (curr_offset - offset)));
+	(gchar*)format_text(poctets, len - (curr_offset - offset)));
 
     curr_offset += len - (curr_offset - offset);
 
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 87d7226469..d1feaa7d35 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -543,13 +543,13 @@ static int dissect_pascal_string(tvbuff_t *tvb, int offset, proto_tree *tree,
 	int hf_index)
 {
 	int len;
+	char *tmp;
 
 	len = tvb_get_guint8(tvb, offset);
 	offset++;
 
 	if ( tree )
 	{
-		char *tmp;
 		proto_tree *item;
 		proto_tree *subtree;
 
@@ -558,7 +558,7 @@ static int dissect_pascal_string(tvbuff_t *tvb, int offset, proto_tree *tree,
 		 * code, we could perhaps avoid allocating and freeing
 		 * this string buffer.
 		 */
-		tmp = tvb_get_ephemeral_string(tvb, offset, len);
+		tmp = (gchar*)tvb_get_ephemeral_string(tvb, offset, len);
 		item = proto_tree_add_string(tree, hf_index, tvb, offset-1, len+1, tmp);
 
 		subtree = proto_item_add_subtree(item, ett_pstring);
@@ -980,6 +980,15 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
 	guint8  len;
 	guint8  i;
 
+  	proto_tree *adr_tree;
+  	char *tmp;
+  	const guint8 *ip;
+  	guint16 net;
+  	guint8  node;
+  	guint16 port;
+
+	guint16 ulen;
+
 	if (!tree)
 		return offset;
 
@@ -1087,12 +1096,6 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
 	}
 
 	if (adr_ofs) {
-        	proto_tree *adr_tree;
-		char *tmp;
-        	const guint8 *ip;
-		guint16 net;
-		guint8  node;
-        	guint16 port;
 
 		ofs = adr_ofs;
 		nbe = tvb_get_guint8(tvb, ofs);
@@ -1128,7 +1131,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
 				break;
 			case 4: /* DNS */
 				if (len > 2) {
-					tmp = tvb_get_ephemeral_string(tvb, ofs +2, len -2);
+					tmp = (gchar*)tvb_get_ephemeral_string(tvb, ofs +2, len -2);
 					ti = proto_tree_add_text(adr_tree, tvb, ofs, len, "dns %s", tmp);
 					break;
 				}
@@ -1161,12 +1164,10 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
 		}
 	}
 	if (utf_ofs) {
-		guint16 ulen;
-		char *tmp;
 
 		ofs = utf_ofs;
 		ulen = tvb_get_ntohs(tvb, ofs);
-		tmp = tvb_get_ephemeral_string(tvb, ofs + 2, ulen);
+		tmp = (gchar*)tvb_get_ephemeral_string(tvb, ofs + 2, ulen);
 		ti = proto_tree_add_text(tree, tvb, ofs, ulen +2, "UTF8 server name: %s", tmp);
 		sub_tree = proto_item_add_subtree(ti, ett_asp_utf8_name);
 		proto_tree_add_uint(sub_tree, hf_asp_server_utf8_name_len, tvb, ofs, 2, ulen);
diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c
index 3eaf2a4f2c..5b6bf76bb4 100644
--- a/epan/dissectors/packet-beep.c
+++ b/epan/dissectors/packet-beep.c
@@ -447,7 +447,7 @@ dissect_beep_int(tvbuff_t *tvb, int offset,
 
   /* XXX - is this still "Dangerous" now that we don't copy to the
      last byte of "int_buff[]"? */
-  sscanf(int_buff, "%d", &ival);
+  sscanf((gchar*)int_buff, "%d", &ival);
 
   if (tree) {
     proto_tree_add_uint(tree, hf, tvb, offset, i, ival);
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index a417db8e25..5e76948348 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -2062,10 +2062,10 @@ dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 
 	if(name_string) {
 		if(out_tvb && tvb_length(out_tvb) >= name_len) {
-			tvb_memcpy(out_tvb, name_string, 0, name_len-1);
+			tvb_memcpy(out_tvb, (guint8*)name_string, 0, name_len-1);
 			name_string[name_len-1] = '\0';
 		} else if(out_tvb) {
-			tvb_memcpy(out_tvb, name_string, 0, -1);
+			tvb_memcpy(out_tvb, (guint8*)name_string, 0, -1);
 			name_string[tvb_length(out_tvb)] = '\0';
 		}
 	}
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index c6fd1eff75..c6df2214b2 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -213,7 +213,7 @@ static enum_val_t pkt_ccc_protocol_versions[] = {
 };
 
 static gint pkt_ccc_protocol_version = PACKETCABLE_CCC_RFC_3495;
-static gint pkt_ccc_option = 122;
+static guint pkt_ccc_option = 122;
 
 
 static int dissect_vendor_pxeclient_suboption(proto_tree *v_tree, tvbuff_t *tvb,
@@ -842,7 +842,7 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff,
 
 		/* PXE protocol 2.1 as described in the intel specs */
 		if (*vendor_class_id_p != NULL &&
-		    strncmp(*vendor_class_id_p, "PXEClient", strlen("PXEClient")) == 0) {
+		    strncmp((gchar*)*vendor_class_id_p, "PXEClient", strlen((gchar*)"PXEClient")) == 0) {
 			proto_item_append_text(vti, " (PXEClient)");
 			v_tree = proto_item_add_subtree(vti, ett_bootp_option);
 
@@ -852,9 +852,9 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff,
 					tvb, optoff, optend);
 			}
 		} else if (*vendor_class_id_p != NULL &&
-			   ((strncmp(*vendor_class_id_p, "pktc", strlen("pktc")) == 0) ||
-                            (strncmp(*vendor_class_id_p, "docsis", strlen("docsis")) == 0) ||
-                            (strncmp(*vendor_class_id_p, "CableHome", strlen("CableHome")) == 0))) {
+			   ((strncmp((gchar*)*vendor_class_id_p, "pktc", strlen((gchar*)"pktc")) == 0) ||
+                            (strncmp((gchar*)*vendor_class_id_p, "docsis", strlen((gchar*)"docsis")) == 0) ||
+                            (strncmp((gchar*)*vendor_class_id_p, "CableHome", strlen((gchar*)"CableHome")) == 0))) {
 		        /* CableLabs standard - see www.cablelabs.com/projects */
 		        proto_item_append_text(vti, " (CableLabs)");
 
@@ -941,12 +941,23 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff,
 		 */
 		proto_item_append_text(vti, " = \"%s\"",
 			tvb_format_stringzpad(tvb, optoff, consumed-2));
-		if ((tvb_memeql(tvb, optoff, PACKETCABLE_MTA_CAP10, strlen(PACKETCABLE_MTA_CAP10)) == 0) ||
-			(tvb_memeql(tvb, optoff, PACKETCABLE_MTA_CAP15, strlen(PACKETCABLE_MTA_CAP10)) == 0)) {
+		if ((tvb_memeql(tvb, optoff, (guint8*)PACKETCABLE_MTA_CAP10, 
+				      strlen(PACKETCABLE_MTA_CAP10)) == 0)
+		    ||
+		    (tvb_memeql(tvb, optoff, (guint8*)PACKETCABLE_MTA_CAP15, 
+				      strlen(PACKETCABLE_MTA_CAP10)) == 0)) 
+		{
 			dissect_packetcable_mta_cap(v_tree, tvb, optoff, optlen);
-		} else if (tvb_memeql(tvb, optoff, PACKETCABLE_CM_CAP11, strlen(PACKETCABLE_CM_CAP11)) == 0 ||
-				tvb_memeql(tvb, optoff, PACKETCABLE_CM_CAP20, strlen(PACKETCABLE_CM_CAP20)) == 0 ) {
+		} 
+		else {
+		  if (tvb_memeql(tvb, optoff, (guint8*)PACKETCABLE_CM_CAP11, 
+				      strlen(PACKETCABLE_CM_CAP11)) == 0
+		      ||
+		      tvb_memeql(tvb, optoff, (guint8*)PACKETCABLE_CM_CAP20, 
+				      strlen(PACKETCABLE_CM_CAP20)) == 0 ) 
+		  {
 			dissect_docsis_cm_cap(v_tree, tvb, optoff, optlen);
+		  }
 		}
 		break;
 
@@ -2297,7 +2308,7 @@ dissect_packetcable_mta_cap(proto_tree *v_tree, tvbuff_t *tvb, int voff, int len
 	proto_tree *subtree, *subtree2;
 
 	tvb_memcpy (tvb, asc_val, off, 2);
-	if (sscanf(asc_val, "%x", &tlv_len) != 1 || tlv_len < 1) {
+	if (sscanf((gchar*)asc_val, "%x", &tlv_len) != 1 || tlv_len < 1) {
 		proto_tree_add_text(v_tree, tvb, off, len - off,
 			"Bogus length: %s", asc_val);
 		return;
@@ -2312,7 +2323,7 @@ dissect_packetcable_mta_cap(proto_tree *v_tree, tvbuff_t *tvb, int voff, int len
 
 			/* Length */
 			tvb_memcpy(tvb, asc_val, off + 2, 2);
-			if (sscanf(asc_val, "%x", &tlv_len) != 1 || tlv_len < 1) {
+			if (sscanf((gchar*)asc_val, "%x", &tlv_len) != 1 || tlv_len < 1) {
 				proto_tree_add_text(v_tree, tvb, off, len - off,
 							"[Bogus length: %s]", asc_val);
 				return;
@@ -2377,7 +2388,7 @@ dissect_packetcable_mta_cap(proto_tree *v_tree, tvbuff_t *tvb, int voff, int len
 					case PKT_MDC_PROV_FLOWS:
 						tvb_memcpy(tvb, flow_val_str, off + 4, 4);
 						flow_val_str[4] = '\0';
-						flow_val = strtoul(flow_val_str, NULL, 16);
+						flow_val = strtoul((gchar*)flow_val_str, NULL, 16);
 						proto_item_append_text(ti,
 						    "0x%04lx", flow_val);
 						break;
@@ -2440,7 +2451,7 @@ dissect_packetcable_mta_cap(proto_tree *v_tree, tvbuff_t *tvb, int voff, int len
 
 					subopt_off += 2;
 					tvb_memcpy(tvb, asc_val, subopt_off, 2);
-					if (sscanf(asc_val, "%x", &mib_val) != 1) {
+					if (sscanf((gchar*)asc_val, "%x", &mib_val) != 1) {
 						proto_tree_add_text(v_tree, tvb, subopt_off, 2,
 									"[Bogus bitfield: %s]", asc_val);
 						return;
@@ -2490,7 +2501,7 @@ dissect_docsis_cm_cap(proto_tree *v_tree, tvbuff_t *tvb, int voff, int len)
 	proto_item *ti;
 
 	tvb_memcpy (tvb, asc_val, off, 2);
-	if (sscanf(asc_val, "%x", &tlv_len) != 1 || tlv_len < 1) {
+	if (sscanf((gchar*)asc_val, "%x", &tlv_len) != 1 || tlv_len < 1) {
 		proto_tree_add_text(v_tree, tvb, off, len - off,
 				    "Bogus length: %s", asc_val);
 		return;
@@ -2505,7 +2516,7 @@ dissect_docsis_cm_cap(proto_tree *v_tree, tvbuff_t *tvb, int voff, int len)
 
 			/* Length */
 			tvb_memcpy(tvb, asc_val, off + 2, 2);
-			if (sscanf(asc_val, "%x", &tlv_len) != 1 || tlv_len < 1) {
+			if (sscanf((gchar*)asc_val, "%x", &tlv_len) != 1 || tlv_len < 1) {
 				proto_tree_add_text(v_tree, tvb, off, len - off,
 							"[Bogus length: %s]", asc_val);
 				return;
@@ -2553,7 +2564,7 @@ dissect_docsis_cm_cap(proto_tree *v_tree, tvbuff_t *tvb, int voff, int len)
 					case DOCS_CM_TET:
 					case DOCS_CM_TET_LC:
 						tvb_memcpy (tvb, asc_val, off + 4, 2);
-						raw_val = strtoul(asc_val, NULL, 16);
+						raw_val = strtoul((gchar*)asc_val, NULL, 16);
 						proto_item_append_text(ti,
 						    "%lu", raw_val);
 						break;
@@ -2562,13 +2573,13 @@ dissect_docsis_cm_cap(proto_tree *v_tree, tvbuff_t *tvb, int voff, int len)
 					case DOCS_CM_LLCFILT_SUP:
 					case DOCS_CM_LLCFILT_SUP_LC:
 						tvb_memcpy (tvb, asc_val, off + 4, 4);
-						raw_val = strtoul(asc_val, NULL, 16);
+						raw_val = strtoul((gchar*)asc_val, NULL, 16);
 						proto_item_append_text(ti,
 						    "%lu", raw_val);
 						break;
 					case DOCS_CM_FILT_SUP:
 						tvb_memcpy (tvb, asc_val, off + 4, 2);
-						raw_val = strtoul(asc_val, NULL, 16);
+						raw_val = strtoul((gchar*)asc_val, NULL, 16);
 						if (raw_val & 0x01)
 							proto_item_append_text(ti,
 							    "802.1p filtering");
@@ -3133,7 +3144,7 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			proto_tree_add_string_format(bp_tree, hf_bootp_server, tvb,
 						   SERVER_NAME_OFFSET,
 						   SERVER_NAME_LEN,
-						   tvb_get_ptr(tvb, SERVER_NAME_OFFSET, 1),
+						   (gchar*)tvb_get_ptr(tvb, SERVER_NAME_OFFSET, 1),
 						   "Server host name not given");
 		}
 
@@ -3147,7 +3158,7 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			proto_tree_add_string_format(bp_tree, hf_bootp_file, tvb,
 						   FILE_NAME_OFFSET,
 						   FILE_NAME_LEN,
-						   tvb_get_ptr(tvb, FILE_NAME_OFFSET, 1),
+						   (gchar*)tvb_get_ptr(tvb, FILE_NAME_OFFSET, 1),
 						   "Boot file name not given");
 		}
 	}
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index 84b2495a9f..87443cbdef 100644
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -532,7 +532,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	  total_msti_length = version_3_length * MSTI_MESSAGE_SIZE;
 	}
       } else {
-	if (tvb_reported_length(tvb) == config_format_selector + MST_BPDU_SIZE + 1 ) {
+	if (tvb_reported_length(tvb) == (guint)config_format_selector + MST_BPDU_SIZE + 1 ) {
 	  msti_format = MSTI_FORMAT_ALTERNATIVE;
 	  total_msti_length = config_format_selector - VERSION_3_STATIC_LENGTH;
 	} else {
diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c
index 221ef8fa53..348bf130e9 100644
--- a/epan/dissectors/packet-bthci_acl.c
+++ b/epan/dissectors/packet-bthci_acl.c
@@ -170,7 +170,7 @@ dissect_btacl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				mfp->last_frame=0;
 				mfp->tot_len=l2cap_length+4;
 				mfp->reassembled=se_alloc(l2cap_length+4);
-				tvb_memcpy(tvb, mfp->reassembled, offset, tvb_length_remaining(tvb, offset));
+				tvb_memcpy(tvb, (guint8*)mfp->reassembled, offset, tvb_length_remaining(tvb, offset));
 				mfp->cur_off=tvb_length_remaining(tvb, offset);
 				se_tree_insert32(chandle_data->start_fragments, pinfo->fd->num, mfp);
 			} else {
@@ -189,7 +189,7 @@ dissect_btacl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			mfp=se_tree_lookup32_le(chandle_data->start_fragments, pinfo->fd->num);
 			if(!pinfo->fd->flags.visited){
 				if(mfp && !mfp->last_frame && (mfp->tot_len>=mfp->cur_off+tvb_length_remaining(tvb, offset))){
-					tvb_memcpy(tvb, mfp->reassembled+mfp->cur_off, offset, tvb_length_remaining(tvb, offset));
+					tvb_memcpy(tvb, (guint8*)mfp->reassembled+mfp->cur_off, offset, tvb_length_remaining(tvb, offset));
 					mfp->cur_off+=tvb_length_remaining(tvb, offset);
 					if(mfp->cur_off==mfp->tot_len){
 						mfp->last_frame=pinfo->fd->num;
@@ -205,7 +205,7 @@ dissect_btacl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				}
 			}
 			if(mfp && mfp->last_frame==pinfo->fd->num){
-				next_tvb = tvb_new_real_data(mfp->reassembled, mfp->tot_len, mfp->tot_len);
+				next_tvb = tvb_new_real_data((guint8*)mfp->reassembled, mfp->tot_len, mfp->tot_len);
 				tvb_set_child_real_data_tvbuff(tvb, next_tvb);
 				add_new_data_source(pinfo, next_tvb, "Reassembled BTHCI ACL");
 
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index 027b180351..534dcef533 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -351,7 +351,7 @@ dissect_sdp_type(proto_tree *t, tvbuff_t *tvb, int offset, char **attr_val)
 	guint8 byte0;
 	guint8 type;
 	guint8 size_index;
-
+	char *ptr;
 
 	str=ep_alloc(MAX_SDP_LEN+1);
 	*attr_val=str;
@@ -416,7 +416,7 @@ dissect_sdp_type(proto_tree *t, tvbuff_t *tvb, int offset, char **attr_val)
 	}
 	case 8:	/* fall through */
 	case 4: {
-		char *ptr = tvb_get_ephemeral_string(tvb, offset, size);
+		ptr = (gchar*)tvb_get_ephemeral_string(tvb, offset, size);
 		
 		proto_tree_add_text(t, tvb, start_offset, type_size, "%s \"%s\"", 
 				    type == 8 ? "URL" : "String", ptr);
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index f7e9e473af..fe1197406b 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -1438,7 +1438,7 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb,packet_info *pinfo, guint32 of
     switch (vb_type) {
 
     case COPS_INTEGER:
-      offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, start, -1, &vb_integer_value);
+      offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, start, -1, (guint*)&vb_integer_value);
       length = offset - vb_value_start;
       if (tree) {
 #ifdef HAVE_NET_SNMP
@@ -2973,12 +2973,12 @@ cops_surveillance_parameters(tvbuff_t *tvb, proto_tree *st, guint n, guint32 off
      offset += 4;
 
      /* BCID Element ID */
-     bcid_str = tvb_format_text(tvb, offset, 8);
+     bcid_str = (guchar*)tvb_format_text(tvb, offset, 8);
      proto_tree_add_text(stt, tvb, offset, 8,"%-28s : '%s'","BCID - Element ID",bcid_str);
      offset += 8;
 
      /* BCID Time Zone */
-     bcid_str = tvb_format_text(tvb, offset, 8);
+     bcid_str = (guchar*)tvb_format_text(tvb, offset, 8);
      proto_tree_add_text(stt, tvb, offset, 8,"%-28s : '%s'","BCID - Time Zone",bcid_str);
      offset += 8;
 
@@ -3034,12 +3034,12 @@ cops_event_generation_info(tvbuff_t *tvb, proto_tree *st, guint n, guint32 offse
      offset += 4;
 
      /* BCID Element ID */
-     bcid_str = tvb_format_text(tvb, offset, 8);
+     bcid_str = (guchar*)tvb_format_text(tvb, offset, 8);
      proto_tree_add_text(stt, tvb, offset, 8,"%-28s : '%s'","BCID - Element ID",bcid_str);
      offset += 8;
 
      /* BCID Time Zone */
-     bcid_str = tvb_format_text(tvb, offset, 8);
+     bcid_str = (guchar*)tvb_format_text(tvb, offset, 8);
      proto_tree_add_text(stt, tvb, offset, 8,"%-28s : '%s'","BCID - Time Zone",bcid_str);
      offset += 8;
 
@@ -4276,12 +4276,12 @@ cops_mm_event_generation_info(tvbuff_t *tvb, proto_tree *st, guint n, guint32 of
      offset += 4;
 
      /* BCID Element ID */
-     bcid_str = tvb_format_text(tvb, offset, 8);
+     bcid_str = (guchar*)tvb_format_text(tvb, offset, 8);
      proto_tree_add_text(stt, tvb, offset, 8,"%-28s : '%s'","BCID - Element ID",bcid_str);
      offset += 8;
 
      /* BCID Time Zone */
-     bcid_str = tvb_format_text(tvb, offset, 8);
+     bcid_str = (guchar*)tvb_format_text(tvb, offset, 8);
      proto_tree_add_text(stt, tvb, offset, 8,"%-28s : '%s'","BCID - Time Zone",bcid_str);
      offset += 8;
 
diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c
index 5df4063414..d5d86085c4 100644
--- a/epan/dissectors/packet-cups.c
+++ b/epan/dissectors/packet-cups.c
@@ -340,7 +340,7 @@ get_unquoted_string(tvbuff_t *tvb, gint offset, gint *next_offset, guint *len)
 	guint l = 0;
 	gint o;
 
-	o = tvb_pbrk_guint8(tvb, offset, -1, " \t\r\n");
+	o = tvb_pbrk_guint8(tvb, offset, -1, (guint8*)" \t\r\n");
 	if (o != -1) {
 		l = o - offset;
 		s = tvb_get_ptr(tvb, offset, l);
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index 6bf1e13390..04fb3e8371 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -179,7 +179,7 @@ static int ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo,
 		int offset, proto_tree *tree,int is_response,
 		int number, gboolean *need_desegmentation );
 static int ssh_dissect_protocol(tvbuff_t *tvb, packet_info *pinfo,
-		int offset, proto_tree *tree,int is_response,int *version,
+		int offset, proto_tree *tree,int is_response,guint *version,
 		gboolean *need_desegmentation);
 static int ssh_dissect_encrypted_packet(tvbuff_t *tvb, packet_info *pinfo,
 		int offset, proto_tree *tree,int is_response);
@@ -613,7 +613,7 @@ ssh_dissect_encrypted_packet(tvbuff_t *tvb, packet_info *pinfo,
 
 static int
 ssh_dissect_protocol(tvbuff_t *tvb, packet_info *pinfo,
-	       	int offset, proto_tree *tree, int is_response, int * version,
+	       	int offset, proto_tree *tree, int is_response, guint * version,
 		gboolean *need_desegmentation)
 {
 	guint	remain_length;
diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c
index 055ddb6aba..a32e72be4b 100644
--- a/epan/dissectors/packet-synergy.c
+++ b/epan/dissectors/packet-synergy.c
@@ -161,7 +161,7 @@ dissect_synergy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		ti = proto_tree_add_protocol_format(tree, proto_synergy, tvb, 0, -1,"Synergy Protocol");
 		synergy_tree = proto_item_add_subtree(ti, ett_synergy);
 
-		tvb_get_nstringz(tvb,offset+4,20,buffer);
+		tvb_get_nstringz(tvb,offset+4,20,(guint8*)buffer);
 
 		if(strncmp(buffer,"Synergy",7)==0)
 			dissect_synergy_handshake(tvb,pinfo,synergy_tree,offset+4);
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 89201fe6fb..9e88581211 100644
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -808,7 +808,7 @@ static void
 dissect_t30_facsimile_coded_data(tvbuff_t *tvb, int offset, packet_info *pinfo, int len, proto_tree *tree)
 {
 	guint8 octet;
-	gchar *t4_data;
+	guint8 *t4_data;
 
 	if (len < 2) {
 		proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED OR SHORT PACKET: FCD length must be at least 2 bytes]");
@@ -836,7 +836,7 @@ static void
 dissect_t30_non_standard_cap(tvbuff_t *tvb, int offset, packet_info *pinfo, int len, proto_tree *tree)
 {
 	guint8 octet;
-	gchar *non_standard_bytes;
+	guint8 *non_standard_bytes;
 
 	if (len < 2) {
 		proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED OR SHORT PACKET: NSC length must be at least 2 bytes]");
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c
index 61bf65fdad..e9d431b9b6 100644
--- a/epan/dissectors/packet-tacacs.c
+++ b/epan/dissectors/packet-tacacs.c
@@ -857,7 +857,7 @@ mkipv4_address( address **addr, const char *str_addr )
 	inet_pton( AF_INET, str_addr, addr_data );
 	(*addr)->type=AT_IPv4;
 	(*addr)->len=4;
-	(*addr)->data=addr_data;
+	(*addr)->data=(guint8*)addr_data;
 }
 static void
 parse_tuple( char *key_from_option )
diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c
index 2ec10bf156..878d456065 100644
--- a/epan/dissectors/packet-tali.c
+++ b/epan/dissectors/packet-tali.c
@@ -101,7 +101,7 @@ dissect_tali_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_item *tali_item = NULL;
   proto_tree *tali_tree = NULL;
   
-  tvb_memcpy(tvb, opcode, TALI_SYNC_LENGTH, TALI_OPCODE_LENGTH);
+  tvb_memcpy(tvb, (guint8*)opcode, TALI_SYNC_LENGTH, TALI_OPCODE_LENGTH);
   opcode[TALI_OPCODE_LENGTH] = '\0';
   length = tvb_get_letohs(tvb, TALI_SYNC_LENGTH + TALI_OPCODE_LENGTH);
 
@@ -154,11 +154,11 @@ dissect_tali_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   if (tvb_reported_length(tvb) < TALI_HEADER_LENGTH)	/* Mandatory header	*/
     return FALSE;
 
-  tvb_memcpy(tvb, sync, 0, TALI_SYNC_LENGTH);
+  tvb_memcpy(tvb, (guint8*)sync, 0, TALI_SYNC_LENGTH);
   if (strncmp(sync, TALI_SYNC, TALI_SYNC_LENGTH) != 0)
     return FALSE;
 
-  tvb_memcpy(tvb, opcode, TALI_SYNC_LENGTH, TALI_OPCODE_LENGTH);
+  tvb_memcpy(tvb, (guint8*)opcode, TALI_SYNC_LENGTH, TALI_OPCODE_LENGTH);
   if (strncmp(opcode, TALI_TEST, TALI_OPCODE_LENGTH) != 0 &&
       strncmp(opcode, TALI_ALLO, TALI_OPCODE_LENGTH) != 0 &&
       strncmp(opcode, TALI_PROH, TALI_OPCODE_LENGTH) != 0 &&
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 3efa142ab1..c8465089ff 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -2607,7 +2607,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if( data_out_file ) {
       reassemble_tcp( tcph->th_seq,		/* sequence number */
           tcph->th_seglen,			/* data length */
-          tvb_get_ptr(tvb, offset, length_remaining),	/* data */
+          (gchar*)tvb_get_ptr(tvb, offset, length_remaining),	/* data */
           length_remaining,		/* captured data length */
           ( tcph->th_flags & TH_SYN ),		/* is syn set? */
           &pinfo->net_src,
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index 796a4c601e..abf3ac1040 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -699,7 +699,7 @@ dissect_tds_query_packet(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
 	if (is_unicode)
 		msg = tvb_get_ephemeral_faked_unicode(tvb, offset, len/2, TRUE);
 	else
-		msg = tvb_get_ephemeral_string(tvb, offset, len);
+		msg = (gchar*)tvb_get_ephemeral_string(tvb, offset, len);
 
 	proto_tree_add_text(query_tree, tvb, offset, len, "Query: %s", msg);
 	offset += len;
@@ -718,7 +718,7 @@ dissect_tds5_lang_token(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree
     if (is_unicode)
         msg = tvb_get_ephemeral_faked_unicode(tvb, offset, (len)/2, TRUE);
     else
-        msg = tvb_get_ephemeral_string(tvb, offset, len);
+        msg = (gchar*)tvb_get_ephemeral_string(tvb, offset, len);
 
     proto_tree_add_text(tree, tvb, offset, len, "Language text: %s", msg);
 }
@@ -891,7 +891,7 @@ dissect_tds7_login(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				 */
 
 				len *= 2;
-				val = tvb_get_ephemeral_string(tvb, offset2, len);
+				val = (gchar*)tvb_get_ephemeral_string(tvb, offset2, len);
 				val2 = g_malloc((len/2)+1);
 
 				for(j = 0, k = 0; j < len; j += 2, k++) {
@@ -1198,7 +1198,7 @@ dissect_tds_env_chg(tvbuff_t *tvb, guint offset, guint token_sz,
 					new_len, TRUE);
 				new_len *= 2;
 			} else
-				new_val = tvb_get_ephemeral_string(tvb, string_offset, new_len);
+				new_val = (gchar*)tvb_get_ephemeral_string(tvb, string_offset, new_len);
 			proto_tree_add_text(tree, tvb, string_offset, new_len,
 				"New Value: %s", new_val);
 		}
@@ -1225,7 +1225,7 @@ dissect_tds_env_chg(tvbuff_t *tvb, guint offset, guint token_sz,
 			    old_len, TRUE);
 			old_len *= 2;
 		} else
-			old_val = tvb_get_ephemeral_string(tvb, string_offset, old_len);
+			old_val = (gchar*)tvb_get_ephemeral_string(tvb, string_offset, old_len);
 		proto_tree_add_text(tree, tvb, string_offset, old_len,
 		    "Old Value: %s", old_val);
 	 }
@@ -1257,9 +1257,9 @@ dissect_tds_err_token(tvbuff_t *tvb, guint offset, guint token_sz _U_, proto_tre
 		msg = tvb_get_ephemeral_faked_unicode(tvb, offset, msg_len, TRUE);
 		msg_len *= 2;
 	} else {
-		msg = tvb_get_ephemeral_string(tvb, offset, msg_len);
+		msg = (gchar*)tvb_get_ephemeral_string(tvb, offset, msg_len);
 	}
-	proto_tree_add_text(tree, tvb, offset, msg_len, "Error: %s", format_text(msg, strlen(msg)));
+	proto_tree_add_text(tree, tvb, offset, msg_len, "Error: %s", format_text((guchar*)msg, strlen(msg)));
 	offset += msg_len;
 
 	srvr_len = tvb_get_guint8(tvb, offset);
@@ -1271,7 +1271,7 @@ dissect_tds_err_token(tvbuff_t *tvb, guint offset, guint token_sz _U_, proto_tre
 			msg = tvb_get_ephemeral_faked_unicode(tvb, offset, srvr_len, TRUE);
 			srvr_len *=2;
 		} else {
-			msg = tvb_get_ephemeral_string(tvb, offset, srvr_len);
+			msg = (gchar*)tvb_get_ephemeral_string(tvb, offset, srvr_len);
 		}
 		proto_tree_add_text(tree, tvb, offset, srvr_len, "Server name: %s", msg);
 		offset += srvr_len;
@@ -1286,7 +1286,7 @@ dissect_tds_err_token(tvbuff_t *tvb, guint offset, guint token_sz _U_, proto_tre
 			msg = tvb_get_ephemeral_faked_unicode(tvb, offset, proc_len, TRUE);
 			proc_len *=2;
 		} else {
-			msg = tvb_get_ephemeral_string(tvb, offset, proc_len);
+			msg = (gchar*)tvb_get_ephemeral_string(tvb, offset, proc_len);
 		}
 		proto_tree_add_text(tree, tvb, offset, proc_len, "Process name: %s", msg);
 		offset += proc_len;
@@ -1322,9 +1322,9 @@ dissect_tds_login_ack_token(tvbuff_t *tvb, guint offset, guint token_sz, proto_t
 		msg = tvb_get_ephemeral_faked_unicode(tvb, offset, msg_len, TRUE);
 		msg_len *= 2;
 	} else {
-		msg = tvb_get_ephemeral_string(tvb, offset, msg_len);
+		msg = (gchar*)tvb_get_ephemeral_string(tvb, offset, msg_len);
 	}
-	proto_tree_add_text(tree, tvb, offset, msg_len, "Text: %s", format_text(msg, strlen(msg)));
+	proto_tree_add_text(tree, tvb, offset, msg_len, "Text: %s", format_text((guchar*)msg, strlen(msg)));
 	offset += msg_len;
 
 	proto_tree_add_text(tree, tvb, offset, 4, "Server Version");
@@ -1435,7 +1435,7 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 			len = tvb_get_guint8(tvb, offset);
 			proto_tree_add_text(tree, tvb, offset, 1, "RPC Name Length: %u", len);
 			offset += 1;
-			val = tvb_get_ephemeral_string(tvb, offset, len);
+			val = (gchar*)tvb_get_ephemeral_string(tvb, offset, len);
 			proto_tree_add_text(tree, tvb, offset, len, "RPC Name: %s", val);
 			offset += len;
 			break;
diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c
index 1c81e66783..11debe7e9c 100644
--- a/epan/dissectors/packet-telnet.c
+++ b/epan/dissectors/packet-telnet.c
@@ -873,7 +873,7 @@ dissect_authentication_subopt(packet_info *pinfo, const char *optname _U_, tvbuf
 	case TN_AC_NAME:
 		if(len<255){
 			name=ep_alloc(256);
-			tvb_memcpy(tvb, name, offset, len);
+			tvb_memcpy(tvb, (guint8*)name, offset, len);
 			name[len]=0;
 		} else {
 			name="<...name too long...>";
diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c
index f1bd032ad5..ddfe62835f 100644
--- a/epan/dissectors/packet-ucp.c
+++ b/epan/dissectors/packet-ucp.c
@@ -793,7 +793,7 @@ ucp_handle_int(proto_tree *tree, tvbuff_t *tvb, int field, int *offset)
 	tvb_ensure_bytes_exist(tvb, *offset, len + 1);
     } else
 	len = idx - *offset;
-    strval = tvb_get_ephemeral_string(tvb, *offset, len);
+    strval = (gchar*)tvb_get_ephemeral_string(tvb, *offset, len);
     if (len > 0) {
 	intval = atoi(strval);
 	proto_tree_add_uint(tree, field, tvb, *offset, idx, intval);
@@ -819,7 +819,7 @@ ucp_handle_time(proto_tree *tree, tvbuff_t *tvb, int field, int *offset)
 	tvb_ensure_bytes_exist(tvb, *offset, len + 1);
     } else
 	len = idx - *offset;
-    strval = tvb_get_ephemeral_string(tvb, *offset, len);
+    strval = (gchar*)tvb_get_ephemeral_string(tvb, *offset, len);
     if (len > 0) {
 	tval = ucp_mktime(strval);
 	tmptime.secs  = tval;
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index 239cce1520..169cee205f 100644
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -898,7 +898,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
 		break;		 
 	case 10:		/* UNC SGW Fully Qualified Domain/Host Name */
 		if ( ie_len > 0){
-			string = tvb_get_ephemeral_string(tvb, ie_offset, ie_len);
+			string = (gchar*)tvb_get_ephemeral_string(tvb, ie_offset, ie_len);
 			proto_tree_add_string(urr_ie_tree, hf_uma_urr_FQDN, tvb, ie_offset, ie_len, string);
 		}else{
 			proto_tree_add_text(urr_ie_tree,tvb,offset,1,"FQDN not present");
@@ -1298,7 +1298,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
 		break;
 	case 98:		/* UNC Fully Qualified Domain/Host Name */
 		if ( ie_len > 0){
-			string = tvb_get_ephemeral_string(tvb, ie_offset, ie_len);
+			string = (gchar*)tvb_get_ephemeral_string(tvb, ie_offset, ie_len);
 			proto_tree_add_string(urr_ie_tree, hf_uma_unc_FQDN, tvb, ie_offset, ie_len, string);
 		}else{
 			proto_tree_add_text(urr_ie_tree,tvb,offset,1,"UNC FQDN not present");
diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c
index 7fde6ae2dc..e3e4e3c0ba 100644
--- a/epan/dissectors/packet-vtp.c
+++ b/epan/dissectors/packet-vtp.c
@@ -142,7 +142,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 			upd_timestamp = tvb_get_ptr(tvb, offset, 12);
 			proto_tree_add_string_format(vtp_tree, hf_vtp_upd_ts, tvb,
-			    offset, 12, upd_timestamp,
+			    offset, 12, (gchar*)upd_timestamp,
 			    "Update Timestamp: %.2s-%.2s-%.2s %.2s:%.2s:%.2s",
 			    &upd_timestamp[0], &upd_timestamp[2], &upd_timestamp[4],
 			    &upd_timestamp[6], &upd_timestamp[8], &upd_timestamp[10]);
diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c
index d164dace7e..4634e9dbe2 100644
--- a/epan/dissectors/packet-wbxml.c
+++ b/epan/dissectors/packet-wbxml.c
@@ -393,37 +393,73 @@ wv_integer_from_opaque(tvbuff_t *tvb, guint32 offset, guint32 data_len)
 }
 
 static char *
-wv_csp10_opaque_literal_tag(tvbuff_t *tvb, guint32 offset,
-		const char *token, guint8 codepage _U_, guint32 *length)
+wv_csp11_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
+		guint8 token, guint8 codepage, guint32 *length)
 {
 	guint32 data_len = tvb_get_guintvar(tvb, offset, length);
 	char *str = NULL;
 
-	if ( token && ( (strcmp(token, "Code") == 0)
-		|| (strcmp(token, "ContentSize") == 0)
-		|| (strcmp(token, "MessageCount") == 0)
-		|| (strcmp(token, "Validity") == 0)
-		|| (strcmp(token, "KeepAliveTime") == 0)
-		|| (strcmp(token, "TimeToLive") == 0)
-		|| (strcmp(token, "AcceptedContentLength") == 0)
-		|| (strcmp(token, "MultiTrans") == 0)
-		|| (strcmp(token, "ParserSize") == 0)
-		|| (strcmp(token, "ServerPollMin") == 0)
-		|| (strcmp(token, "TCPAddress") == 0)
-		|| (strcmp(token, "TCPPort") == 0)
-		|| (strcmp(token, "UDPPort") == 0) ) )
-	{
-		str = wv_integer_from_opaque(tvb, offset + *length, data_len);
-	}
-	else if ( token && ( strcmp(token, "DateTime") == 0) )
-	{
-		str = wv_datetime_from_opaque(tvb, offset + *length, data_len);
+	switch (codepage) {
+		case 0: /* Common code page */
+			switch (token) {
+				case 0x0B: /* <Code> */
+				case 0x0F: /* <ContentSize> */
+				case 0x1A: /* <MessageCount> */
+				case 0x3C: /* <Validity> */
+					str = wv_integer_from_opaque(tvb,
+							offset + *length, data_len);
+					break;
+				case 0x11: /* <DateTime> */
+					str = wv_datetime_from_opaque(tvb,
+							offset + *length, data_len);
+					break;
+				default:
+					break;
+			}
+			break;
+		case 1: /* Access code page */
+			switch (token) {
+				case 0x1C: /* <KeepAliveTime> */
+				case 0x32: /* <TimeToLive> */
+					str = wv_integer_from_opaque(tvb,
+							offset + *length, data_len);
+					break;
+				default:
+					break;
+			}
+		case 3: /* Client capability code page */
+			switch (token) {
+				case 0x06: /* <AcceptedContentLength> */
+				case 0x0C: /* <MultiTrans> */
+				case 0x0D: /* <ParserSize> */
+				case 0x0E: /* <ServerPollMin> */
+				case 0x12: /* <TCPPort> */
+				case 0x13: /* <UDPPort> */
+					str = wv_integer_from_opaque(tvb,
+							offset + *length, data_len);
+					break;
+				default:
+					break;
+			}
+			break;
+		case 6: /* Messaging code page */
+			switch (token) {
+				case 0x1A: /* <DeliveryTime> - not in 1.0 */
+					str = wv_datetime_from_opaque(tvb,
+							offset + *length, data_len);
+					break;
+				default:
+					break;
+			}
+			break;
+		default:
+			break;
 	}
-
 	if (str == NULL) { /* Error, or not parsed */
 		str = g_strdup_printf("(%d bytes of unparsed opaque data)", data_len);
 	}
 	*length += data_len;
+
 	return str;
 }
 
@@ -489,6 +525,9 @@ wv_csp10_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 	return str;
 }
 
+
+
+#ifdef Remove_this_comment_when_WV_CSP_will_be_an_approved_spec
 static char *
 wv_csp11_opaque_literal_tag(tvbuff_t *tvb, guint32 offset,
 		const char *token, guint8 codepage _U_, guint32 *length)
@@ -525,74 +564,39 @@ wv_csp11_opaque_literal_tag(tvbuff_t *tvb, guint32 offset,
 	return str;
 }
 
+
 static char *
-wv_csp11_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
-		guint8 token, guint8 codepage, guint32 *length)
+wv_csp10_opaque_literal_tag(tvbuff_t *tvb, guint32 offset,
+		const char *token, guint8 codepage _U_, guint32 *length)
 {
 	guint32 data_len = tvb_get_guintvar(tvb, offset, length);
 	char *str = NULL;
 
-	switch (codepage) {
-		case 0: /* Common code page */
-			switch (token) {
-				case 0x0B: /* <Code> */
-				case 0x0F: /* <ContentSize> */
-				case 0x1A: /* <MessageCount> */
-				case 0x3C: /* <Validity> */
-					str = wv_integer_from_opaque(tvb,
-							offset + *length, data_len);
-					break;
-				case 0x11: /* <DateTime> */
-					str = wv_datetime_from_opaque(tvb,
-							offset + *length, data_len);
-					break;
-				default:
-					break;
-			}
-			break;
-		case 1: /* Access code page */
-			switch (token) {
-				case 0x1C: /* <KeepAliveTime> */
-				case 0x32: /* <TimeToLive> */
-					str = wv_integer_from_opaque(tvb,
-							offset + *length, data_len);
-					break;
-				default:
-					break;
-			}
-		case 3: /* Client capability code page */
-			switch (token) {
-				case 0x06: /* <AcceptedContentLength> */
-				case 0x0C: /* <MultiTrans> */
-				case 0x0D: /* <ParserSize> */
-				case 0x0E: /* <ServerPollMin> */
-				case 0x12: /* <TCPPort> */
-				case 0x13: /* <UDPPort> */
-					str = wv_integer_from_opaque(tvb,
-							offset + *length, data_len);
-					break;
-				default:
-					break;
-			}
-			break;
-		case 6: /* Messaging code page */
-			switch (token) {
-				case 0x1A: /* <DeliveryTime> - not in 1.0 */
-					str = wv_datetime_from_opaque(tvb,
-							offset + *length, data_len);
-					break;
-				default:
-					break;
-			}
-			break;
-		default:
-			break;
+	if ( token && ( (strcmp(token, "Code") == 0)
+		|| (strcmp(token, "ContentSize") == 0)
+		|| (strcmp(token, "MessageCount") == 0)
+		|| (strcmp(token, "Validity") == 0)
+		|| (strcmp(token, "KeepAliveTime") == 0)
+		|| (strcmp(token, "TimeToLive") == 0)
+		|| (strcmp(token, "AcceptedContentLength") == 0)
+		|| (strcmp(token, "MultiTrans") == 0)
+		|| (strcmp(token, "ParserSize") == 0)
+		|| (strcmp(token, "ServerPollMin") == 0)
+		|| (strcmp(token, "TCPAddress") == 0)
+		|| (strcmp(token, "TCPPort") == 0)
+		|| (strcmp(token, "UDPPort") == 0) ) )
+	{
+		str = wv_integer_from_opaque(tvb, offset + *length, data_len);
+	}
+	else if ( token && ( strcmp(token, "DateTime") == 0) )
+	{
+		str = wv_datetime_from_opaque(tvb, offset + *length, data_len);
 	}
+
 	if (str == NULL) { /* Error, or not parsed */
 		str = g_strdup_printf("(%d bytes of unparsed opaque data)", data_len);
 	}
 	*length += data_len;
-
 	return str;
 }
 
@@ -715,6 +719,7 @@ wv_csp12_opaque_binary_tag(tvbuff_t *tvb, guint32 offset,
 
 	return str;
 }
+#endif
 
 static char *
 sic10_opaque_literal_attr(tvbuff_t *tvb, guint32 offset,
@@ -5561,7 +5566,7 @@ parse_wbxml_tag_defined (proto_tree *tree, tvbuff_t *tvb, guint32 offset,
 				DebugLog(("STAG: LITERAL tag (peek = 0x%02X, off = %u) - TableRef follows!\n", peek, off));
 				index = tvb_get_guintvar (tvb, off+1, &tag_len);
 				str_len = tvb_strsize (tvb, str_tbl+index);
-				tag_new_literal = tvb_get_ptr (tvb, str_tbl+index, str_len);
+				tag_new_literal = (gchar*)tvb_get_ptr (tvb, str_tbl+index, str_len);
 				tag_new_known = 0; /* invalidate known tag_new */
 			} else { /* Known tag */
 				tag_new_known = peek & 0x3F;
@@ -5948,7 +5953,7 @@ parse_wbxml_tag (proto_tree *tree, tvbuff_t *tvb, guint32 offset,
 							" - TableRef follows!\n", peek, off));
 				index = tvb_get_guintvar (tvb, off+1, &tag_len);
 				str_len = tvb_strsize (tvb, str_tbl+index);
-				tag_new_literal = tvb_get_ptr (tvb, str_tbl+index, str_len);
+				tag_new_literal = (gchar*)tvb_get_ptr (tvb, str_tbl+index, str_len);
 				tag_new_known = 0; /* invalidate known tag_new */
 			} else { /* Known tag */
 				tag_new_known = peek & 0x3F;
diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c
index 13c9b47f27..537aed6743 100644
--- a/epan/dissectors/packet-who.c
+++ b/epan/dissectors/packet-who.c
@@ -138,7 +138,7 @@ dissect_who(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	}
 	offset += 4;
 
-	tvb_get_nstringz0(tvb, offset, sizeof(server_name), server_name);
+	tvb_get_nstringz0(tvb, offset, sizeof(server_name), (guint8*)server_name);
 	if (tree)
 		proto_tree_add_string(who_tree, hf_who_hostname, tvb, offset,
 		    32, server_name);
@@ -202,12 +202,12 @@ dissect_whoent(tvbuff_t *tvb, int offset, proto_tree *tree)
 		    line_offset, SIZE_OF_WHOENT, FALSE);
 		whoent_tree = proto_item_add_subtree(whoent_ti, ett_whoent);
 
-	    	tvb_get_nstringz0(tvb, line_offset, sizeof(out_line), out_line);
+	    	tvb_get_nstringz0(tvb, line_offset, sizeof(out_line), (guint8*)out_line);
 		proto_tree_add_string(whoent_tree, hf_who_tty, tvb, line_offset,
 		    8, out_line);
 		line_offset += 8;
 
-	    	tvb_get_nstringz0(tvb, line_offset, sizeof(out_name), out_name);
+	    	tvb_get_nstringz0(tvb, line_offset, sizeof(out_name), (guint8*)out_name);
 		proto_tree_add_string(whoent_tree, hf_who_uid, tvb, line_offset,
 		    8, out_name);
 		line_offset += 8;
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c
index fb16126f20..339ad6b37e 100644
--- a/epan/dissectors/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
@@ -2026,7 +2026,7 @@ static void listOfString8(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
 		  s = ep_alloc(l + 1);
 		  allocated = l + 1;
 	    }
-	    stringCopy(s, tvb_get_ptr(tvb, *offsetp + 1, l), l); /* Nothing better for now. We need a better string handling API. */
+	    stringCopy(s, (gchar *)tvb_get_ptr(tvb, *offsetp + 1, l), l); /* Nothing better for now. We need a better string handling API. */
 	    proto_tree_add_string_format(tt, hf_item, tvb, *offsetp, l + 1, s, "\"%s\"", s);
 	    *offsetp += l + 1;
       }
@@ -2082,7 +2082,7 @@ static void string16_with_buffer_preallocated(tvbuff_t *tvb, proto_tree *t,
 	    if (truncated) { *dp++ = '.'; *dp++ = '.'; *dp++ = '.'; }
 
 	    *dp++ = '\0';
-	    proto_tree_add_string_format(t, hf, tvb, offset, length, tvb_get_ptr(tvb, offset, length), "%s: %s",
+	    proto_tree_add_string_format(t, hf, tvb, offset, length, (gchar *)tvb_get_ptr(tvb, offset, length), "%s: %s",
 					proto_registrar_get_nth(hf) -> name, *s);
       } else
 	    proto_tree_add_item(t, hf_bytes, tvb, offset, length, little_endian);
@@ -2130,7 +2130,7 @@ static void listOfTextItem(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
 			s = ep_alloc(l + 1);
 			allocated = l + 1;
 		  }
-		  stringCopy(s, tvb_get_ptr(tvb, *offsetp + 2, l), l);
+		  stringCopy(s, (gchar *)tvb_get_ptr(tvb, *offsetp + 2, l), l);
 		  tti = proto_tree_add_none_format(tt, hf_x11_textitem_string, tvb, *offsetp, l + 2,
 						       "textitem (string): delta = %d, \"%s\"",
 						       delta, s);
@@ -2406,7 +2406,7 @@ static void string8(tvbuff_t *tvb, int *offsetp, proto_tree *t,
 
       p = tvb_get_ptr(tvb, *offsetp, length);
       s = ep_alloc(length + 1);
-      stringCopy(s, p, length);
+      stringCopy(s, (gchar *)p, length);
       proto_tree_add_string(t, hf, tvb, *offsetp, length, s);
       *offsetp += length;
 }
@@ -2417,7 +2417,7 @@ static void string16(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
     int hf_bytes, unsigned length, gboolean little_endian)
 {
       char *s = NULL;
-      unsigned l = 0;
+      gint l = 0;
 
       length += length;
       string16_with_buffer_preallocated(tvb, t, hf, hf_bytes, *offsetp, length,
@@ -2982,7 +2982,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo,
 
 		v16 = VALUE16(tvb, 4);
 		name = se_alloc(v16 + 1);
-		stringCopy(name, tvb_get_ptr(tvb, 8, v16), v16);
+		stringCopy(name, (gchar*)tvb_get_ptr(tvb, 8, v16), v16);
 
 		/* store string of extension, opcode will be set at reply */
 		i = 0;
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index 6524303cae..757004474f 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -1509,6 +1509,10 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     void *saved_private_data;
     fragment_data *fd_head;
 
+
+    guint8 spi;
+    int is_x_264;
+    guint8 prt_id;
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "X.25");
 
@@ -1596,19 +1600,16 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	localoffset = 3;
 	if (localoffset < x25_pkt_len) { /* calling/called addresses */
 	    if (toa)
-		x25_toa(x25_tree, &localoffset, tvb, pinfo);
+		x25_toa(x25_tree, (gint*)&localoffset, tvb, pinfo);
 	    else
-		x25_ntoa(x25_tree, &localoffset, tvb, pinfo, FALSE);
+		x25_ntoa(x25_tree, (gint*)&localoffset, tvb, pinfo, FALSE);
 	}
 
 	if (localoffset < x25_pkt_len) /* facilities */
-	    dump_facilities(x25_tree, &localoffset, tvb);
+	    dump_facilities(x25_tree, (gint*)&localoffset, tvb);
 
 	if (localoffset < tvb_reported_length(tvb)) /* user data */
 	{
-	    guint8 spi;
-	    int is_x_264;
-	    guint8 prt_id;
 
 	    if (x25_tree) {
 		ti = proto_tree_add_text(x25_tree, tvb, localoffset, -1,
@@ -1891,13 +1892,13 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	localoffset = 3;
         if (localoffset < x25_pkt_len) { /* calling/called addresses */
 	    if (toa)
-		x25_toa(x25_tree, &localoffset, tvb, pinfo);
+		x25_toa(x25_tree, (gint*)&localoffset, tvb, pinfo);
 	    else
-		x25_ntoa(x25_tree, &localoffset, tvb, pinfo, FALSE);
+		x25_ntoa(x25_tree, (gint*)&localoffset, tvb, pinfo, FALSE);
 	}
 
 	if (localoffset < x25_pkt_len) /* facilities */
-	    dump_facilities(x25_tree, &localoffset, tvb);
+	    dump_facilities(x25_tree, (gint*)&localoffset, tvb);
 	break;
     case X25_CLEAR_REQUEST:
         switch (dir) {
@@ -1947,13 +1948,13 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 	if (localoffset < tvb_reported_length(tvb)) { /* extended clear conf format */
 	    if (toa)
-		x25_toa(x25_tree, &localoffset, tvb, pinfo);
+		x25_toa(x25_tree, (gint*)&localoffset, tvb, pinfo);
 	    else
-		x25_ntoa(x25_tree, &localoffset, tvb, pinfo, FALSE);
+		x25_ntoa(x25_tree,(gint*)&localoffset, tvb, pinfo, FALSE);
 	}
 
 	if (localoffset < tvb_reported_length(tvb)) /* facilities */
-	    dump_facilities(x25_tree, &localoffset, tvb);
+	    dump_facilities(x25_tree, (gint*)&localoffset, tvb);
 	break;
     case X25_DIAGNOSTIC:
 	if(check_col(pinfo->cinfo, COL_INFO)) {
@@ -2083,7 +2084,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 		    X25_REGISTRATION_REQUEST);
 	localoffset = 3;
 	if (localoffset < x25_pkt_len)
-	    x25_ntoa(x25_tree, &localoffset, tvb, pinfo, TRUE);
+	    x25_ntoa(x25_tree, (gint*)&localoffset, tvb, pinfo, TRUE);
 
 	if (x25_tree) {
 	    if (localoffset < x25_pkt_len)
@@ -2110,7 +2111,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	}
 	localoffset = 5;
 	if (localoffset < x25_pkt_len)
-	    x25_ntoa(x25_tree, &localoffset, tvb, pinfo, TRUE);
+	    x25_ntoa(x25_tree, (gint*)&localoffset, tvb, pinfo, TRUE);
 
 	if (x25_tree) {
 	    if (localoffset < x25_pkt_len)
diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c
index 1f48a97e07..aeb1ccfd4d 100644
--- a/epan/dissectors/packet-xdmcp.c
+++ b/epan/dissectors/packet-xdmcp.c
@@ -118,7 +118,7 @@ static gint xdmcp_add_string(proto_tree *tree, gint hf,
   len = tvb_get_ntohs(tvb, offset);
   p = tvb_get_ptr(tvb, offset+2, len);
   str = g_malloc(len+1);
-  stringCopy(str, p, len);
+  stringCopy(str, (gchar*)p, len);
   proto_tree_add_string(tree, hf, tvb, offset, len+2, str);
   g_free(str);
 
@@ -135,7 +135,7 @@ static gint xdmcp_add_text(proto_tree *tree, const char *text,
   len = tvb_get_ntohs(tvb, offset);
   p = tvb_get_ptr(tvb, offset+2, len);
   str = g_malloc(len+1);
-  stringCopy(str, p, len);
+  stringCopy(str, (gchar*)p, len);
   proto_tree_add_text(tree, tvb, offset, len+2, "%s: %s", text, str);
   g_free(str);
 
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index c2a1ae17aa..dbd1d3d00d 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -242,7 +242,7 @@ static void before_xmpli(void* tvbparse_data, const void* wanted_data _U_, tvbpa
 	proto_item* pi;
 	proto_tree* pt;
 	tvbparse_elem_t* name_tok = tok->sub->next;
-	gchar* name = tvb_get_ephemeral_string(name_tok->tvb,name_tok->offset,name_tok->len);
+	gchar* name = (gchar*)tvb_get_ephemeral_string(name_tok->tvb,name_tok->offset,name_tok->len);
 	xml_ns_t* ns = g_hash_table_lookup(xmpli_names,name);
 
 	int hf_tag;
@@ -305,8 +305,8 @@ static void before_tag(void* tvbparse_data, const void* wanted_data _U_, tvbpars
         tvbparse_elem_t* leaf_tok = name_tok->sub->sub->next->next;
         xml_ns_t* nameroot_ns;
 
-        root_name = tvb_get_ephemeral_string(root_tok->tvb,root_tok->offset,root_tok->len);
-        name = tvb_get_ephemeral_string(leaf_tok->tvb,leaf_tok->offset,leaf_tok->len);
+        root_name = (gchar*)tvb_get_ephemeral_string(root_tok->tvb,root_tok->offset,root_tok->len);
+        name = (gchar*)tvb_get_ephemeral_string(leaf_tok->tvb,leaf_tok->offset,leaf_tok->len);
 
         nameroot_ns = g_hash_table_lookup(xml_ns.elements,root_name);
 
@@ -320,7 +320,7 @@ static void before_tag(void* tvbparse_data, const void* wanted_data _U_, tvbpars
         }
 
     } else {
-        name = tvb_get_ephemeral_string(name_tok->tvb,name_tok->offset,name_tok->len);
+        name = (gchar*)tvb_get_ephemeral_string(name_tok->tvb,name_tok->offset,name_tok->len);
         g_strdown(name);
 
         if(current_frame->ns) {
@@ -440,7 +440,7 @@ static void get_attrib_value(void* tvbparse_data _U_, const void* wanted_data _U
 static void after_attrib(void* tvbparse_data, const void* wanted_data _U_, tvbparse_elem_t* tok) {
 	GPtrArray* stack = tvbparse_data;
 	xml_frame_t* current_frame = g_ptr_array_index(stack,stack->len - 1);
-	gchar* name = tvb_get_ephemeral_string(tok->sub->tvb,tok->sub->offset,tok->sub->len);
+	gchar* name = (gchar*)tvb_get_ephemeral_string(tok->sub->tvb,tok->sub->offset,tok->sub->len);
 	tvbparse_elem_t* value = tok->sub->next->next->data;
 	int* hfidp;
 	int hfid;
diff --git a/epan/dissectors/packet-yhoo.c b/epan/dissectors/packet-yhoo.c
index f6e711a697..f747e89f57 100644
--- a/epan/dissectors/packet-yhoo.c
+++ b/epan/dissectors/packet-yhoo.c
@@ -205,7 +205,7 @@ dissect_yhoo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		col_add_fstr(pinfo->cinfo, COL_INFO,
 			"%s: %s",
-			( strncmp(tvb_get_ptr(tvb, offset + 0, 4), "YPNS", 4) == 0 ) ? "Request" : "Response",
+			( strncmp((gchar*)tvb_get_ptr(tvb, offset + 0, 4), "YPNS", 4) == 0 ) ? "Request" : "Response",
 			val_to_str(tvb_get_letohl(tvb, offset + 12),
 				 yhoo_service_vals, "Unknown Service: %u")
 		);