Try to fix -Wpointer-sign warnings.

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

5 files changed, 14 insertions, 14 deletions

diff --git a/epan/dissectors/file-rbm.c b/epan/dissectors/file-rbm.c
index 13d8bff3aa..c1ba0de895 100644
--- a/epan/dissectors/file-rbm.c
+++ b/epan/dissectors/file-rbm.c
@@ -134,7 +134,7 @@ void get_rbm_integer(tvbuff_t* tvb, guint offset, gint32* value, gint* len)
 	}
 }
 
-static void dissect_rbm_integer(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, gchar** value_str)
+static void dissect_rbm_integer(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, gint* offset, gchar** value_str)
 {
 	gint32 value = 0;
 	gint len = 0;
@@ -146,7 +146,7 @@ static void dissect_rbm_integer(tvbuff_t* tvb, packet_info* pinfo, proto_tree* t
 		*value_str = wmem_strdup_printf(wmem_packet_scope(), "%d", value);
 }
 
-static void dissect_rbm_basic(tvbuff_t* tvb _U_, packet_info* pinfo, proto_tree* tree _U_, guint* offset _U_, const guint8 subtype,
+static void dissect_rbm_basic(tvbuff_t* tvb _U_, packet_info* pinfo, proto_tree* tree _U_, gint* offset _U_, const guint8 subtype,
 	gchar** type, gchar** value_str)
 {
 	switch (subtype) {
@@ -167,25 +167,25 @@ static void dissect_rbm_basic(tvbuff_t* tvb _U_, packet_info* pinfo, proto_tree*
 	rbm_set_info(pinfo, *type);
 }
 
-static void dissect_rbm_string_data_trailer(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, const gchar* label,
+static void dissect_rbm_string_data_trailer(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, gint* offset, const gchar* label,
 	const gchar* prefix, const gchar* trailer, gchar** value_str)
 {
 	gint32 value = 0;
 	gint len = 0;
-	guint8* s;
+	const char* s;
 
 	rbm_set_info(pinfo, label);
 
 	get_rbm_integer(tvb, *offset, &value, &len);
 	proto_tree_add_int_format_value(tree, hf_rbm_length, tvb, *offset, len, value, "%d", value);
 	*offset += len;
-	s = tvb_get_string_enc(wmem_packet_scope(), tvb, *offset, value, ENC_NA);
+	s = (const char*)tvb_get_string_enc(wmem_packet_scope(), tvb, *offset, value, ENC_NA);
 	proto_tree_add_string_format_value(tree, hf_rbm_string, tvb, *offset, value, s, "%s%s%s", prefix, s, trailer);
 	*offset += value;
 	*value_str = wmem_strdup_printf(wmem_packet_scope(), "%s%s%s", prefix, s, trailer);
 }
 
-static void dissect_rbm_string_data(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, const gchar* label,
+static void dissect_rbm_string_data(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, gint* offset, const gchar* label,
 	const gchar* prefix, gchar** value_str)
 {
 	dissect_rbm_string_data_trailer(tvb, pinfo, tree, offset, label, prefix, "", value_str);
@@ -284,14 +284,14 @@ static void dissect_rbm_double(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tr
 	gint32 value = 0;
 	gdouble valued;
 	gint len = 0;
-	guint8* s;
+	const char* s;
 
 	rbm_set_info(pinfo, "Double");
 
 	get_rbm_integer(tvb, *offset, &value, &len);
 	proto_tree_add_int_format_value(tree, hf_rbm_length, tvb, *offset, len, value, "%d", value);
 	*offset += len;
-	s = tvb_get_string_enc(wmem_packet_scope(), tvb, *offset, value, ENC_NA);
+	s = (const char*)tvb_get_string_enc(wmem_packet_scope(), tvb, *offset, value, ENC_NA);
 	valued = g_ascii_strtod(s, NULL);
 	proto_tree_add_double(tree, hf_rbm_double, tvb, *offset, value, valued);
 	*offset += value;
diff --git a/epan/dissectors/packet-aastra-aasp.c b/epan/dissectors/packet-aastra-aasp.c
index c1449e328e..17c8df21ca 100644
--- a/epan/dissectors/packet-aastra-aasp.c
+++ b/epan/dissectors/packet-aastra-aasp.c
@@ -384,7 +384,7 @@ dissect_aasp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
         aasp_tree = proto_item_add_subtree(ti, ett_aasp);
 
         /* separation of command; jump "a=" */
-        if(tvb_memeql(tvb, 0, "a=", 2) == 0)
+        if(tvb_memeql(tvb, 0, (const guint8*)"a=", 2) == 0)
         {
             prev = 2;
             for(i=2; i<n;)
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index fde5c4fa07..3fbb5e8e35 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -3173,7 +3173,7 @@ is_acn_or_rdmnet_over_udp(tvbuff_t *tvb, guint32 *protocol_id)
     return FALSE;
 
   /* Check the bytes in octets 4 - 16 */
-  if (tvb_memeql(tvb, 4, acn_packet_id, sizeof(acn_packet_id)-1) != 0)
+  if (tvb_memeql(tvb, 4, (const guint8*)acn_packet_id, sizeof(acn_packet_id)-1) != 0)
     return FALSE;
 
   offset = 16;
@@ -3206,7 +3206,7 @@ is_rdmnet_over_tcp(tvbuff_t *tvb)
   }
 
   /* Check the bytes in octets 0 - 12 */
-  if (tvb_memeql(tvb, 0, acn_packet_id, sizeof(acn_packet_id)-1) != 0) {
+  if (tvb_memeql(tvb, 0, (const guint8*)acn_packet_id, sizeof(acn_packet_id)-1) != 0) {
     return FALSE;
   }
 
diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c
index 322aee0395..0b1c721302 100644
--- a/epan/dissectors/packet-aeron.c
+++ b/epan/dissectors/packet-aeron.c
@@ -1951,7 +1951,7 @@ static void aeron_msg_fragment_add(aeron_msg_t * msg, aeron_msg_fragment_t * fra
     msg->next_expected_term_offset += fragment->frame_length;
     if ((fragment->flags & DATA_FLAGS_END) == DATA_FLAGS_END)
     {
-        gchar * buf;
+        guint8 * buf;
         wmem_list_frame_t * lf;
         size_t ofs = 0;
         size_t accum_len = 0;
@@ -1961,7 +1961,7 @@ static void aeron_msg_fragment_add(aeron_msg_t * msg, aeron_msg_fragment_t * fra
 
         msg->complete = TRUE;
         msg->end_frame = fragment->frame;
-        buf = (gchar *) wmem_alloc(wmem_file_scope(), (size_t) msg->length);
+        buf = (guint8 *) wmem_alloc(wmem_file_scope(), (size_t) msg->length);
         lf = wmem_list_head(msg->fragment);
         while (lf != NULL)
         {
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index fee7a2b530..d091f7d010 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -2250,7 +2250,7 @@ loop_record(tvbuff_t *tvb, proto_tree *ptree, gint offset,
 			}
 			if (name) {
 				tree = proto_tree_add_subtree(ptree, tvb, offset, size,
-										ett_afp_enumerate_line, NULL, name);
+										ett_afp_enumerate_line, NULL, (const char*)name);
 			}
 			else {
 				tree = proto_tree_add_subtree_format(ptree, tvb, offset, size,