Try to squelch [-Wpointer-sign] warnings.

Change-Id: Ic2bdf6acde0eef222264665622f33f7513f3fc9d
Reviewed-on: https://code.wireshark.org/review/37673
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

4 files changed, 83 insertions, 83 deletions

diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c
index 9396be0c22..e1862a501e 100644
--- a/epan/dissectors/packet-quic.c
+++ b/epan/dissectors/packet-quic.c
@@ -978,7 +978,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
     proto_item *ti_ft, *ti_ftflags, *ti;
     proto_tree *ft_tree, *ftflags_tree;
     guint64 frame_type;
-    guint32 lenft;
+    gint32 lenft;
     guint   orig_offset = offset;
 
     ti_ft = proto_tree_add_item(quic_tree, hf_quic_frame, tvb, offset, 1, ENC_NA);
@@ -1010,7 +1010,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         case FT_ACK:
         case FT_ACK_ECN:{
             guint64 ack_range_count;
-            guint32 lenvar;
+            gint32 lenvar;
 
             if (frame_type == FT_ACK) {
                 col_append_fstr(pinfo->cinfo, COL_INFO, ", ACK");
@@ -1058,7 +1058,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         break;
         case FT_RESET_STREAM:{
             guint64 stream_id, error_code;
-            guint32 len_streamid = 0, len_finalsize = 0, len_error_code = 0;
+            gint32 len_streamid = 0, len_finalsize = 0, len_error_code = 0;
 
             col_append_fstr(pinfo->cinfo, COL_INFO, ", RS");
 
@@ -1078,9 +1078,9 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         }
         break;
         case FT_STOP_SENDING:{
-            guint32 len_streamid;
+            gint32 len_streamid;
             guint64 stream_id, error_code;
-            guint32 len_error_code = 0;
+            gint32 len_error_code = 0;
 
             col_append_fstr(pinfo->cinfo, COL_INFO, ", SS");
 
@@ -1098,7 +1098,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         break;
         case FT_CRYPTO: {
             guint64 crypto_offset, crypto_length;
-            guint32 lenvar;
+            gint32 lenvar;
             col_append_fstr(pinfo->cinfo, COL_INFO, ", CRYPTO");
             proto_tree_add_item_ret_varint(ft_tree, hf_quic_crypto_offset, tvb, offset, -1, ENC_VARINT_QUIC, &crypto_offset, &lenvar);
             offset += lenvar;
@@ -1124,7 +1124,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         break;
         case FT_NEW_TOKEN: {
             guint64 token_length;
-            guint32 lenvar;
+            gint32 lenvar;
 
             col_append_fstr(pinfo->cinfo, COL_INFO, ", NT");
 
@@ -1144,7 +1144,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         case FT_STREAM_E:
         case FT_STREAM_F: {
             guint64 stream_id, stream_offset = 0, length;
-            guint32 lenvar;
+            gint32 lenvar;
 
             offset -= 1;
 
@@ -1186,7 +1186,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         }
         break;
         case FT_MAX_DATA:{
-            guint32 len_maximumdata;
+            gint32 len_maximumdata;
 
             col_append_fstr(pinfo->cinfo, COL_INFO, ", MD");
 
@@ -1195,7 +1195,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         }
         break;
         case FT_MAX_STREAM_DATA:{
-            guint32 len_streamid, len_maximumstreamdata;
+            gint32 len_streamid, len_maximumstreamdata;
             guint64 stream_id;
 
             col_append_fstr(pinfo->cinfo, COL_INFO, ", MSD");
@@ -1212,7 +1212,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         break;
         case FT_MAX_STREAMS_BIDI:
         case FT_MAX_STREAMS_UNI:{
-            guint32 len_streamid;
+            gint32 len_streamid;
 
             col_append_fstr(pinfo->cinfo, COL_INFO, ", MS");
 
@@ -1221,7 +1221,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         }
         break;
         case FT_DATA_BLOCKED:{
-            guint32 len_offset;
+            gint32 len_offset;
 
             col_append_fstr(pinfo->cinfo, COL_INFO, ", DB");
 
@@ -1230,7 +1230,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         }
         break;
         case FT_STREAM_DATA_BLOCKED:{
-            guint32 len_streamid, len_offset;
+            gint32 len_streamid, len_offset;
             guint64 stream_id;
 
             col_append_fstr(pinfo->cinfo, COL_INFO, ", SDB");
@@ -1247,7 +1247,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         break;
         case FT_STREAMS_BLOCKED_BIDI:
         case FT_STREAMS_BLOCKED_UNI:{
-            guint32 len_streamid;
+            gint32 len_streamid;
 
             col_append_fstr(pinfo->cinfo, COL_INFO, ", SB");
 
@@ -1256,9 +1256,9 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         }
         break;
         case FT_NEW_CONNECTION_ID:{
-            guint32 len_sequence;
-            guint32 len_retire_prior_to;
-            guint32 nci_length;
+            gint32 len_sequence;
+            gint32 len_retire_prior_to;
+            gint32 nci_length;
             gboolean valid_cid = FALSE;
 
             col_append_fstr(pinfo->cinfo, COL_INFO, ", NCI");
@@ -1292,7 +1292,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         }
         break;
         case FT_RETIRE_CONNECTION_ID:{
-            guint32 len_sequence;
+            gint32 len_sequence;
             proto_tree_add_item_ret_varint(ft_tree, hf_quic_rci_sequence, tvb, offset, -1, ENC_VARINT_QUIC, NULL, &len_sequence);
             offset += len_sequence;
         }
@@ -1313,7 +1313,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         break;
         case FT_CONNECTION_CLOSE_TPT:
         case FT_CONNECTION_CLOSE_APP:{
-            guint32 len_reasonphrase, len_frametype, len_error_code;
+            gint32 len_reasonphrase, len_frametype, len_error_code;
             guint64 len_reason = 0;
             guint64 error_code;
             const char *tls_alert = NULL;
@@ -1360,7 +1360,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         break;
         case FT_DATAGRAM:
         case FT_DATAGRAM_LENGTH:{
-            guint32 dg_length;
+            gint32 dg_length;
             guint64 length;
             col_append_fstr(pinfo->cinfo, COL_INFO, ", DG");
             if (frame_type == FT_DATAGRAM_LENGTH) {
@@ -1375,7 +1375,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         }
         break;
         case FT_ACK_FREQUENCY:{
-            guint32 length;
+            gint32 length;
 
             proto_tree_add_item_ret_varint(ft_tree, hf_quic_af_sequence_number, tvb, offset, -1, ENC_VARINT_QUIC, NULL, &length);
             offset += (guint32)length;
@@ -1388,7 +1388,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree
         }
         break;
         case FT_TIME_STAMP:{
-            guint32 length;
+            gint32 length;
 
             proto_tree_add_item_ret_varint(ft_tree, hf_quic_ts, tvb, offset, -1, ENC_VARINT_QUIC, NULL, &length);
             offset += (guint32)length;
@@ -2141,9 +2141,9 @@ dissect_quic_long_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tre
     guint8 long_packet_type;
     guint32 version;
     quic_cid_t  dcid = {.len=0}, scid = {.len=0};
-    guint32 len_token_length;
+    gint32 len_token_length;
     guint64 token_length;
-    guint32 len_payload_length;
+    gint32 len_payload_length;
     guint64 payload_length;
     guint8  first_byte = 0;
     quic_info_data_t *conn = dgram_info->conn;
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index cc24fe2d77..7d630d6219 100644
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -2021,7 +2021,7 @@ guint16 rtps_util_add_vendor_id(proto_tree *tree,
  * } Locator_t;
  */
 void rtps_util_add_locator_t(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint offset,
-                             const guint encoding, const guint8 *label) {
+                             const guint encoding, const char *label) {
 
   proto_tree *ti;
   proto_tree *locator_tree;
@@ -2629,7 +2629,7 @@ static void rtps_util_add_timestamp_sec_and_fraction(proto_tree *tree,
   const guint encoding,
   int hf_time _U_) {
 
-  guint8  tempBuffer[MAX_TIMESTAMP_SIZE];
+  gchar  tempBuffer[MAX_TIMESTAMP_SIZE];
   gdouble absolute;
   gint32 sec;
   guint32 frac;
@@ -2809,7 +2809,7 @@ gint rtps_util_add_seq_string(proto_tree *tree, tvbuff_t *tvb, gint offset,
                               int hf_string, const char *label) {
   guint32 size;
   gint32 i, num_strings;
-  const guint8 *retVal;
+  const char *retVal;
   proto_tree *string_tree;
   gint start;
 
@@ -2827,7 +2827,7 @@ gint rtps_util_add_seq_string(proto_tree *tree, tvbuff_t *tvb, gint offset,
   for (i = 0; i < num_strings; ++i) {
     size = tvb_get_guint32(tvb, offset, encoding);
 
-    retVal = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, size, ENC_ASCII);
+    retVal = (const char* )tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, size, ENC_ASCII);
 
     proto_tree_add_string_format(string_tree, hf_string, tvb, offset, size+4, retVal,
         "%s[%d]: %s", label, i, retVal);
@@ -3000,7 +3000,7 @@ static gint rtps_util_add_typecode(proto_tree *tree, tvbuff_t *tvb, gint offset,
      */
     case RTI_CDR_TK_UNION: {
         guint32     struct_name_len;
-        gint8      *struct_name;
+        guint8      *struct_name;
         const char *discriminator_name      = "<unknown>"; /* for unions */
         char       *discriminator_enum_name = NULL;        /* for unions with enum discriminator */
         /*guint32 defaultIdx;*/ /* Currently is ignored */
diff --git a/epan/dissectors/packet-rtps.h b/epan/dissectors/packet-rtps.h
index 79b03212f0..2a25b61dde 100644
--- a/epan/dissectors/packet-rtps.h
+++ b/epan/dissectors/packet-rtps.h
@@ -659,7 +659,7 @@ static int hf_rtps_dissection_string                             = -1;
 extern guint16 rtps_util_add_protocol_version(proto_tree *tree, tvbuff_t* tvb, gint offset);
 extern guint16 rtps_util_add_vendor_id(proto_tree *tree, tvbuff_t * tvb, gint offset);
 extern void rtps_util_add_locator_t(proto_tree *tree, packet_info *pinfo, tvbuff_t * tvb, gint offset,
-                             const guint encoding, const guint8 * label);
+                             const guint encoding, const char * label);
 extern int rtps_util_add_locator_list(proto_tree *tree, packet_info *pinfo, tvbuff_t * tvb,
                                 gint offset, const guint8* label, const guint encoding);
 extern int rtps_util_add_multichannel_locator_list(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 18e67700f9..29657e5f6d 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -3318,7 +3318,7 @@ dissect_old_dir_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
 	COUNT_BYTES(dn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Directory: %s",
-		    format_text(wmem_packet_scope(), dn, strlen(dn)));
+		    format_text(wmem_packet_scope(), (const guchar *)dn, strlen(dn)));
 
 	END_OF_SMB
 
@@ -3457,7 +3457,7 @@ dissect_tree_connect_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
 	COUNT_BYTES(an_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-		    format_text(wmem_packet_scope(), an, strlen(an)));
+		    format_text(wmem_packet_scope(), (const guchar*)an, strlen(an)));
 
 	/* buffer format */
 	CHECK_BYTE_COUNT(1);
@@ -3739,11 +3739,11 @@ dissect_move_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
 	if (fn == NULL)
 		goto endofcommand;
 	proto_tree_add_string_format(tree, hf_smb_file_name, tvb, offset,
-		fn_len,	fn, "Old File Name: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+		fn_len,	fn, "Old File Name: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 	COUNT_BYTES(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Old Name: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	/* buffer format */
 	CHECK_BYTE_COUNT(1);
@@ -3756,11 +3756,11 @@ dissect_move_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
 	if (fn == NULL)
 		goto endofcommand;
 	proto_tree_add_string_format(tree, hf_smb_file_name, tvb, offset,
-		fn_len,	fn, "New File Name: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+		fn_len,	fn, "New File Name: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 	COUNT_BYTES(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", New Name: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	END_OF_SMB
 
@@ -3803,11 +3803,11 @@ dissect_copy_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
 	if (fn == NULL)
 		goto endofcommand;
 	proto_tree_add_string_format(tree, hf_smb_file_name, tvb, offset,
-		fn_len, fn, "Source File Name: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+		fn_len, fn, "Source File Name: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 	COUNT_BYTES(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Source Name: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	/* buffer format */
 	CHECK_BYTE_COUNT(1);
@@ -3821,10 +3821,10 @@ dissect_copy_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
 		goto endofcommand;
 	proto_tree_add_string_format(tree, hf_smb_file_name, tvb, offset,
 		fn_len, fn, "Destination File Name: %s",
-		format_text(wmem_packet_scope(), fn, strlen(fn)));
+		format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 	COUNT_BYTES(fn_len);
 
-	col_append_fstr(pinfo->cinfo, COL_INFO, ", Destination Name: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+	col_append_fstr(pinfo->cinfo, COL_INFO, ", Destination Name: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	END_OF_SMB
 
@@ -3915,7 +3915,7 @@ dissect_open_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i
 	}
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	END_OF_SMB
 
@@ -4478,7 +4478,7 @@ dissect_create_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	END_OF_SMB
 
@@ -4546,7 +4546,7 @@ dissect_delete_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	COUNT_BYTES(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	END_OF_SMB
 
@@ -4587,7 +4587,7 @@ dissect_rename_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	COUNT_BYTES(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Old Name: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	/* buffer format */
 	CHECK_BYTE_COUNT(1);
@@ -4605,7 +4605,7 @@ dissect_rename_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	COUNT_BYTES(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", New Name: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	END_OF_SMB
 
@@ -4660,7 +4660,7 @@ dissect_nt_rename_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
 	COUNT_BYTES(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Old Name: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	/* buffer format */
 	CHECK_BYTE_COUNT(1);
@@ -4677,7 +4677,7 @@ dissect_nt_rename_file_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
 	COUNT_BYTES(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", New Name: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	END_OF_SMB
 
@@ -4714,7 +4714,7 @@ dissect_query_information_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 	COUNT_BYTES(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	END_OF_SMB
 
@@ -4789,7 +4789,7 @@ dissect_set_information_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
 	COUNT_BYTES(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	END_OF_SMB
 
@@ -5239,7 +5239,7 @@ dissect_create_temporary_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 	COUNT_BYTES(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	END_OF_SMB
 
@@ -6069,7 +6069,7 @@ dissect_search_find_request(tvbuff_t *tvb, packet_info *pinfo,
 	COUNT_BYTES(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	/* buffer format */
 	CHECK_BYTE_COUNT(1);
@@ -6768,7 +6768,7 @@ dissect_open_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i
 	}
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	END_OF_SMB
 
@@ -7863,8 +7863,8 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 		else
 			col_append_fstr(pinfo->cinfo, COL_INFO,
 					"%s\\%s",
-					format_text(wmem_packet_scope(), dn, strlen(dn)),
-					format_text(wmem_packet_scope(), an, strlen(an)));
+					format_text(wmem_packet_scope(), (const guchar*)dn, strlen(dn)),
+					format_text(wmem_packet_scope(), (const guchar*)an, strlen(an)));
 
 		/* OS */
 		an = get_unicode_or_ascii_string(tvb, &offset,
@@ -8222,7 +8222,7 @@ dissect_tree_connect_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 	}
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-		    format_text(wmem_packet_scope(), an, strlen(an)));
+		    format_text(wmem_packet_scope(), (const guchar*)an, strlen(an)));
 
 	/*
 	 * NOTE: the Service string is always ASCII, even if the
@@ -10705,7 +10705,7 @@ dissect_nt_create_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
 	}
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	END_OF_SMB
 
@@ -11366,7 +11366,7 @@ dissect_get_dfs_request_data(tvbuff_t *tvb, packet_info *pinfo,
 	COUNT_BYTES_TRANS(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	*bcp = bc;
 	return offset;
@@ -11446,7 +11446,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo,
 		COUNT_BYTES_TRANS(fn_len);
 
 		col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-			    format_text(wmem_packet_scope(), fn, strlen(fn)));
+			    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 		break;
 	case 0x0001:	/*TRANS2_FIND_FIRST2*/
 		/* Search Attributes */
@@ -11488,7 +11488,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo,
 		COUNT_BYTES_TRANS(fn_len);
 
 		col_append_fstr(pinfo->cinfo, COL_INFO, ", Pattern: %s",
-			    format_text(wmem_packet_scope(), fn, strlen(fn)));
+			    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 		break;
 	case 0x0002:	/*TRANS2_FIND_NEXT2*/
@@ -11528,7 +11528,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo,
 		COUNT_BYTES_TRANS(fn_len);
 
 		col_append_fstr(pinfo->cinfo, COL_INFO, ", Continue: %s",
-			    format_text(wmem_packet_scope(), fn, strlen(fn)));
+			    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 		break;
 	case 0x0003:	/*TRANS2_QUERY_FS_INFORMATION*/
@@ -11590,7 +11590,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo,
 		}
 
 		col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-			    format_text(wmem_packet_scope(), fn, strlen(fn)));
+			    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 		break;
 	case 0x0006:	/*TRANS2_SET_PATH_INFORMATION*/
@@ -11615,7 +11615,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo,
 		COUNT_BYTES_TRANS(fn_len);
 
 		col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-			    format_text(wmem_packet_scope(), fn, strlen(fn)));
+			    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 		break;
 	case 0x0007: {	/*TRANS2_QUERY_FILE_INFORMATION*/
@@ -11741,7 +11741,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo,
 		COUNT_BYTES_TRANS(fn_len);
 
 		col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
-			    format_text(wmem_packet_scope(), fn, strlen(fn)));
+			    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 		break;
 	case 0x000c:	/*TRANS2_FIND_NOTIFY_NEXT*/
@@ -11771,7 +11771,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo,
 		COUNT_BYTES_TRANS(fn_len);
 
 		col_append_fstr(pinfo->cinfo, COL_INFO, ", Dir: %s",
-			    format_text(wmem_packet_scope(), fn, strlen(fn)));
+			    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 		break;
 	case 0x000e:	/*TRANS2_SESSION_SETUP*/
 		/* XXX unknown structure*/
@@ -11788,7 +11788,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo,
 		COUNT_BYTES_TRANS(fn_len);
 
 		col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s",
-			    format_text(wmem_packet_scope(), fn, strlen(fn)));
+			    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 		break;
 	}
 
@@ -12852,7 +12852,7 @@ dissect_qfi_SMB_FILE_STREAM_INFO(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
 			fn);
 		COUNT_BYTES_SUBR(fn_len);
 
-		proto_item_append_text(item, ": %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+		proto_item_append_text(item, ": %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 		proto_item_set_len(item, offset-old_offset);
 
 		if (neo == 0)
@@ -14651,7 +14651,7 @@ dissect_4_3_4_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 	col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
 		    format_text(wmem_packet_scope(), fn, strlen(fn)));
 
-	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 	proto_item_set_len(item, offset-old_offset);
 
 	*trunc = FALSE;
@@ -14756,9 +14756,9 @@ dissect_4_3_4_2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 	COUNT_BYTES_SUBR(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
-	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	/*
 	 * To quote the footnote for FileName in Section 2.2.8.1.2:
@@ -14886,9 +14886,9 @@ dissect_4_3_4_3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 	COUNT_BYTES_SUBR(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
-	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 	proto_item_set_len(item, offset-old_offset);
 
 	return offset;
@@ -14971,7 +14971,7 @@ dissect_4_3_4_4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 	COUNT_BYTES_SUBR(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	/* skip to next structure */
 	if (neo) {
@@ -14988,7 +14988,7 @@ dissect_4_3_4_4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 		}
 	}
 
-	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 	proto_item_set_len(item, offset-old_offset);
 
 	*trunc = FALSE;
@@ -15078,7 +15078,7 @@ dissect_4_3_4_5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 	COUNT_BYTES_SUBR(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	/* skip to next structure */
 	if (neo) {
@@ -15095,7 +15095,7 @@ dissect_4_3_4_5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 		}
 	}
 
-	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 	proto_item_set_len(item, offset-old_offset);
 
 	*trunc = FALSE;
@@ -15211,7 +15211,7 @@ dissect_4_3_4_6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 	COUNT_BYTES_SUBR(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	/* skip to next structure */
 	if (neo) {
@@ -15228,7 +15228,7 @@ dissect_4_3_4_6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 		}
 	}
 
-	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 	proto_item_set_len(item, offset-old_offset);
 
 	*trunc = FALSE;
@@ -15333,7 +15333,7 @@ dissect_4_3_4_6full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 	COUNT_BYTES_SUBR(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	/* skip to next structure */
 	if (neo) {
@@ -15350,7 +15350,7 @@ dissect_4_3_4_6full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 		}
 	}
 
-	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 	proto_item_set_len(item, offset-old_offset);
 
 	*trunc = FALSE;
@@ -15476,7 +15476,7 @@ dissect_4_3_4_6_id_both(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 	COUNT_BYTES_SUBR(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	/* skip to next structure */
 	if (neo) {
@@ -15493,7 +15493,7 @@ dissect_4_3_4_6_id_both(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 		}
 	}
 
-	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 	proto_item_set_len(item, offset-old_offset);
 
 	*trunc = FALSE;
@@ -15557,7 +15557,7 @@ dissect_4_3_4_7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 	COUNT_BYTES_SUBR(fn_len);
 
 	col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
-		    format_text(wmem_packet_scope(), fn, strlen(fn)));
+		    format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 
 	/* skip to next structure */
 	if (neo) {
@@ -15574,7 +15574,7 @@ dissect_4_3_4_7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 		}
 	}
 
-	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), fn, strlen(fn)));
+	proto_item_append_text(item, " File: %s", format_text(wmem_packet_scope(), (const guchar*)fn, strlen(fn)));
 	proto_item_set_len(item, offset-old_offset);
 
 	*trunc = FALSE;