DNS: Try to fix Wpointer-sign warnings.

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

7 files changed, 26 insertions, 26 deletions

diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c
index 1f7a5216c2..5bd88e800d 100644
--- a/epan/dissectors/packet-dhcp.c
+++ b/epan/dissectors/packet-dhcp.c
@@ -2455,7 +2455,7 @@ dissect_dhcpopt_client_full_domain_name(tvbuff_t *tvb, packet_info *pinfo, proto
 	guint8 fqdn_flags;
 	int offset = 0, length = tvb_reported_length(tvb);
 	const guchar	*dns_name;
-	guint		dns_name_len;
+	gint		dns_name_len;
 
 	if (length < 3) {
 		expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length isn't >= 3");
@@ -2781,7 +2781,7 @@ dissect_dhcpopt_dhcp_domain_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
 	int length = tvb_reported_length(tvb);
 	gchar		*name_out;
 	const guchar	*dns_name;
-	guint		dns_name_len;
+	gint		dns_name_len;
 
 	/* Encoding Long Options in the Dynamic Host Configuration Protocol (DHCPv4) (RFC 3396) */
 	/* Domain Names - Implementation And Specification (RFC 1035) */
@@ -2837,7 +2837,7 @@ dissect_dhcpopt_sip_servers(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 {
 	int length = tvb_reported_length(tvb);
 	const guchar	*dns_name;
-	guint		dns_name_len;
+	gint		dns_name_len;
 	gchar		*name_out;
 
 	/* Encoding Long Options in the Dynamic Host Configuration Protocol (DHCPv4) (RFC 3396) */
@@ -3092,7 +3092,7 @@ dissect_dhcpopt_rdnss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
 {
 	int offset = 0;
 	const guchar *dns_name;
-	guint dns_name_len;
+	gint dns_name_len;
 
 	if (tvb_reported_length(tvb) < 10) {
 		expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be >= 10");
@@ -6697,7 +6697,7 @@ dissect_packetcable_ietf_ccc(packet_info *pinfo, proto_item *v_ti, proto_tree *v
 	proto_item   *vti;
 	int	      max_timer_val = 255;
 	const guchar *dns_name;
-	guint	     dns_name_len;
+	gint	     dns_name_len;
 
 	subopt = tvb_get_guint8(tvb, suboptoff);
 	suboptoff++;
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index 7900306037..d7158787a4 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -2729,7 +2729,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree,
     case OPTION_F_DNS_HOST_NAME:
         {
         const gchar *dns_name;
-        guint dns_name_len;
+        gint dns_name_len;
 
         get_dns_name(tvb, off, optlen, off, &dns_name, &dns_name_len);
         proto_tree_add_string(subtree, hf_option_failover_dns_hostname, tvb, off, optlen, format_text(wmem_packet_scope(), dns_name, dns_name_len));
@@ -2738,7 +2738,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree,
     case OPTION_F_DNS_ZONE_NAME:
         {
         const gchar *dns_name;
-        guint dns_name_len;
+        gint dns_name_len;
 
         get_dns_name(tvb, off, optlen, off, &dns_name, &dns_name_len);
         proto_tree_add_string(subtree, hf_option_failover_dns_zonename, tvb, off, optlen, format_text(wmem_packet_scope(), dns_name, dns_name_len));
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 54adb38451..c98cd79606 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -81,7 +81,7 @@ void proto_reg_handoff_dns(void);
 struct DnsTap {
     guint packet_qr;
     guint packet_qtype;
-    guint packet_qclass;
+    gint packet_qclass;
     guint packet_rcode;
     guint packet_opcode;
     guint payload_size;
@@ -1177,10 +1177,10 @@ static int * const dns_csync_flags[] = {
  * of labels
  */
 static guint
-qname_labels_count(const guchar* name, guint name_len)
+qname_labels_count(const guchar* name, gint name_len)
 {
     guint labels = 0;
-    unsigned i;
+    gint i;
 
     if (name_len > 1) {
         /* it was not a Zero-length name */
@@ -1200,7 +1200,7 @@ qname_labels_count(const guchar* name, guint name_len)
  */
 static int
 expand_dns_name(tvbuff_t *tvb, int offset, int max_len, int dns_data_offset,
-    const gchar **name, guint* name_len)
+    const gchar **name, gint* name_len)
 {
   int     start_offset    = offset;
   gchar  *np;
@@ -1383,7 +1383,7 @@ expand_dns_name(tvbuff_t *tvb, int offset, int max_len, int dns_data_offset,
    can contain null bytes, is written in name and its length in name_len. */
 int
 get_dns_name(tvbuff_t *tvb, int offset, int max_len, int dns_data_offset,
-    const gchar **name, guint* name_len)
+    const gchar **name, gint* name_len)
 {
   int len;
 
@@ -1392,7 +1392,7 @@ get_dns_name(tvbuff_t *tvb, int offset, int max_len, int dns_data_offset,
   /* Zero-length name means "root server" */
   if (**name == '\0' && len <= MIN_DNAME_LEN) {
     *name="<Root>";
-    *name_len = (guint)strlen(*name);
+    *name_len = (gint)strlen(*name);
     return len;
   }
 
@@ -1557,7 +1557,7 @@ dissect_dns_query(tvbuff_t *tvb, int offset, int dns_data_offset,
 
 static void
 add_rr_to_tree(proto_tree  *rr_tree, tvbuff_t *tvb, int offset,
-  const guchar *name, int namelen, int type,
+  const gchar *name, int namelen, int type,
   packet_info *pinfo, gboolean is_mdns)
 {
   guint32     ttl_value;
@@ -2163,10 +2163,10 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
 
       cpu_offset = cur_offset;
       cpu_len = tvb_get_guint8(tvb, cpu_offset);
-      cpu = tvb_get_string_enc(wmem_packet_scope(), tvb, cpu_offset + 1, cpu_len, ENC_ASCII|ENC_NA);
+      cpu = (const char* )tvb_get_string_enc(wmem_packet_scope(), tvb, cpu_offset + 1, cpu_len, ENC_ASCII|ENC_NA);
       os_offset = cpu_offset + 1 + cpu_len;
       os_len = tvb_get_guint8(tvb, os_offset);
-      os = tvb_get_string_enc(wmem_packet_scope(), tvb, os_offset + 1, os_len, ENC_ASCII|ENC_NA);
+      os = (const char*)tvb_get_string_enc(wmem_packet_scope(), tvb, os_offset + 1, os_len, ENC_ASCII|ENC_NA);
       col_append_fstr(pinfo->cinfo, COL_INFO, " %.*s %.*s", cpu_len, cpu, os_len, os);
       proto_item_append_text(trr, ", CPU %.*s, OS %.*s", cpu_len, cpu, os_len, os);
 
@@ -2402,7 +2402,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
 
     case T_PX: /* Pointer to X.400/RFC822 mapping info (26)*/
     {
-      guint           px_map822_len, px_mapx400_len;
+      gint           px_map822_len, px_mapx400_len;
       const gchar *px_map822_dnsname, *px_mapx400_dnsname;
 
       col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
@@ -3538,12 +3538,12 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
       cur_offset++;
 
       tag_len = tvb_get_guint8(tvb, cur_offset);
-      tag = tvb_get_string_enc(wmem_packet_scope(), tvb, cur_offset + 1, tag_len, ENC_ASCII|ENC_NA);
+      tag = (const char*)tvb_get_string_enc(wmem_packet_scope(), tvb, cur_offset + 1, tag_len, ENC_ASCII|ENC_NA);
 
       value_len = data_len - (tag_len + 2);
       value = tvb_get_string_enc(wmem_packet_scope(), tvb, cur_offset + 1 + tag_len, value_len, ENC_ASCII|ENC_NA);
 
-      value = format_text(wmem_packet_scope(), (const guchar*)value, value_len);
+      value = format_text(wmem_packet_scope(), value, value_len);
 
       if (strncmp(tag, "issue", tag_len) == 0) {
         cur_hf = hf_dns_caa_issue;
@@ -3735,7 +3735,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   wmem_tree_key_t    key[3];
   struct DnsTap     *dns_stats;
   guint              qtype = 0;
-  guint              qclass = 0;
+  gint               qclass = 0;
   gboolean           retransmission = FALSE;
   const gchar      *name;
   int                name_len;
diff --git a/epan/dissectors/packet-dns.h b/epan/dissectors/packet-dns.h
index 4aeba97600..d53ff2763c 100644
--- a/epan/dissectors/packet-dns.h
+++ b/epan/dissectors/packet-dns.h
@@ -16,7 +16,7 @@
 extern const value_string dns_classes[];
 
 /* Just like expand_dns_name, but pretty-prints empty names. */
-int get_dns_name(tvbuff_t *, int, int, int, const gchar **, guint*);
+int get_dns_name(tvbuff_t *, int, int, int, const gchar **, gint*);
 
 #define MAX_DNAME_LEN   255             /* maximum domain name length */
 
diff --git a/epan/dissectors/packet-gsm_gsup.c b/epan/dissectors/packet-gsm_gsup.c
index 10d5572170..ffc23c0d29 100644
--- a/epan/dissectors/packet-gsm_gsup.c
+++ b/epan/dissectors/packet-gsm_gsup.c
@@ -681,7 +681,7 @@ dissect_gsup_tlvs(tvbuff_t *tvb, int base_offs, int length, packet_info *pinfo,
 		proto_tree *att_tree;
 		const gchar *apn;
 		const gchar *str;
-		guint apn_len;
+		gint apn_len;
 		guint32 ui32;
 
 		tag = tvb_get_guint8(tvb, offset);
diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c
index a9648878eb..709003c649 100644
--- a/epan/dissectors/packet-lwres.c
+++ b/epan/dissectors/packet-lwres.c
@@ -464,7 +464,7 @@ static void dissect_srv_records(tvbuff_t* tvb, proto_tree* tree,guint32 nrec,int
 {
     guint32 i, curr;
     guint16 /*len, namelen,*/ priority, weight, port;
-    guint dlen;
+    gint dlen;
     guint used_bytes;
     const gchar *dname;
 
@@ -532,7 +532,7 @@ static void dissect_mx_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, in
 
     guint i, curr;
     guint priority;
-    guint dlen;
+    gint dlen;
     guint used_bytes;
     const gchar *dname;
 
@@ -582,7 +582,7 @@ static void dissect_mx_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, in
 static void dissect_ns_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, int offset)
 {
     guint i, curr;
-    guint dlen;
+    gint dlen;
     const gchar *dname;
     guint used_bytes;
 
diff --git a/epan/dissectors/packet-smb-common.c b/epan/dissectors/packet-smb-common.c
index f43aa053e4..1eac3dddb7 100644
--- a/epan/dissectors/packet-smb-common.c
+++ b/epan/dissectors/packet-smb-common.c
@@ -114,7 +114,7 @@ int dissect_ms_compressed_string(tvbuff_t *tvb, proto_tree *tree, int offset, in
 				 const char **data)
 {
 	int           compr_len;
-	guint         str_len;
+	gint         str_len;
 	const gchar  *str = NULL;
 
 	/* The name data MUST start at offset 0 of the tvb */