Squelch more warnings.

diff --git a/print-babel.c b/print-babel.c
index 00dcd14cb1fea7b3bd3570eba5f6d8c907a17b50..f01fbc33941b777091338f67633498d3dfe4da2c 100644 (file)
--- a/print-babel.c
+++ b/print-babel.c
@@ -364,7 +364,8 @@ babel_print_v2(netdissect_options *ndo,
     i = 0;
     while(i < bodylen) {
         const u_char *message;
-        uint8_t type, len;
+        uint8_t type;
+        u_int len;
 
         message = cp + 4 + i;
 

diff --git a/print-bgp.c b/print-bgp.c
index a58041b7204680d12acf7c4577ab8d1fb22d44d2..a82dc8fe7b5e57fa93a734d27aa4760645b50e9d 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -1009,8 +1009,8 @@ static int
 decode_multicast_vpn(netdissect_options *ndo,
                      const u_char *pptr, char *buf, size_t buflen)
 {
-    uint8_t route_type, route_length, addr_length;
-    u_int sg_length;
+    uint8_t route_type, route_length;
+    u_int addr_length, sg_length;
     u_int offset;
 
     ND_TCHECK_2(pptr);

diff --git a/print-cdp.c b/print-cdp.c
index fede229d0a7d80c15fad461dc4615b2d0cf9b757..2a6c1e3a333ba6df05bf72c15e84fde435cd4289 100644 (file)
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -93,7 +93,7 @@ void
 cdp_print(netdissect_options *ndo,
           const u_char *pptr, u_int length, u_int caplen)
 {
-       u_int type, len, i, j;
+       u_int type, len, i;
        const u_char *tptr;
 
        ndo->ndo_protocol = "cdp";
@@ -173,12 +173,14 @@ cdp_print(netdissect_options *ndo,
                    case 0x05: /* Version */
                        ND_PRINT("\n\t  ");
                        for (i=0;i<len;i++) {
-                           j = GET_U_1(tptr + i);
-                           if (j == '\n') /* lets rework the version string to
+                           u_char c;
+
+                           c = GET_U_1(tptr + i);
+                           if (c == '\n') /* lets rework the version string to
                                              get a nice indentation */
                                ND_PRINT("\n\t  ");
                            else
-                               fn_print_char(ndo, j);
+                               fn_print_char(ndo, c);
                        }
                        break;
                    case 0x06: /* Platform */

diff --git a/print-decnet.c b/print-decnet.c
index 2a19fd1cf1bdfb081db51b374e7e012646ba6e90..e595067bb50521ec7155fcde126b4151c4f6d4c4 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -618,7 +618,8 @@ print_decnet_ctlmsg(netdissect_options *ndo,
        /* Our caller has already checked for mflags */
        u_int mflags = GET_U_1(rhp->rh_short.sh_flags);
        const union controlmsg *cmp = (const union controlmsg *)rhp;
-       u_int src, dst, info, blksize, eco, ueco, hello, other, vers;
+       uint16_t src, dst;
+       u_int info, blksize, eco, ueco, hello, other, vers;
        u_int priority;
        const u_char *rhpx = (const u_char *)rhp;
        int ret;

diff --git a/print-ip.c b/print-ip.c
index ddc917d528c8099a1286db854cfa59186f86aa21..3478de172dfa4f7ab39c3abf61b43763f5d7bef9 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -483,7 +483,7 @@ ip_print(netdissect_options *ndo,
         * fragments.
         */
        if ((off & IP_OFFMASK) == 0) {
-               u_int nh = GET_U_1(ip->ip_p);
+               uint8_t nh = GET_U_1(ip->ip_p);
 
                if (nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
                    nh != IPPROTO_SCTP && nh != IPPROTO_DCCP) {

diff --git a/print-ip6.c b/print-ip6.c
index f8d234903719a199fe4156207fb1f5edb3246740..37a17cc86e41c6d104072640218de8136ca071e3 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -234,7 +234,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
        const u_char *ipend;
        const u_char *cp;
        u_int payload_len;
-       u_int nh;
+       uint8_t nh;
        int fragmented = 0;
        u_int flow;
 

diff --git a/print-isoclns.c b/print-isoclns.c
index 5ccd0b342a6b2fca14ccdc62f7b4876aff1654d1..43925c2a9de10d26e66d9f6829303e71fa4cc95a 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -2730,8 +2730,8 @@ isis_print(netdissect_options *ndo,
                     nd_print_invalid(ndo);
                     break;
                 }
-                tlen-=ext_is_len;
-                tptr+=ext_is_len;
+                tlen-=(uint8_t)ext_is_len;
+                tptr+=(uint8_t)ext_is_len;
             }
             break;
 
@@ -2745,8 +2745,8 @@ isis_print(netdissect_options *ndo,
                     nd_print_invalid(ndo);
                     break;
                 }
-                tlen-=ext_is_len;
-                tptr+=ext_is_len;
+                tlen-=(uint8_t)ext_is_len;
+                tptr+=(uint8_t)ext_is_len;
             }
             break;
 
@@ -2760,8 +2760,8 @@ isis_print(netdissect_options *ndo,
                     nd_print_invalid(ndo);
                     break;
                 }
-                tlen-=ext_is_len;
-                tptr+=ext_is_len;
+                tlen-=(uint8_t)ext_is_len;
+                tptr+=(uint8_t)ext_is_len;
             }
             break;
         case ISIS_TLV_IS_REACH:
@@ -2811,8 +2811,8 @@ isis_print(netdissect_options *ndo,
                     nd_print_invalid(ndo);
                     break;
                 }
-                tptr+=ext_ip_len;
-                tlen-=ext_ip_len;
+                tlen-=(uint8_t)ext_ip_len;
+                tptr+=(uint8_t)ext_ip_len;
             }
             break;
 
@@ -2833,8 +2833,8 @@ isis_print(netdissect_options *ndo,
                     nd_print_invalid(ndo);
                     break;
                 }
-                tptr+=ext_ip_len;
-                tlen-=ext_ip_len;
+                tlen-=(uint8_t)ext_ip_len;
+                tptr+=(uint8_t)ext_ip_len;
             }
             break;
 
@@ -2848,8 +2848,8 @@ isis_print(netdissect_options *ndo,
                     nd_print_invalid(ndo);
                     break;
                 }
-                tptr+=ext_ip_len;
-                tlen-=ext_ip_len;
+                tlen-=(uint8_t)ext_ip_len;
+                tptr+=(uint8_t)ext_ip_len;
             }
             break;
 
@@ -2870,8 +2870,8 @@ isis_print(netdissect_options *ndo,
                     nd_print_invalid(ndo);
                     break;
                 }
-                tptr+=ext_ip_len;
-                tlen-=ext_ip_len;
+                tlen-=(uint8_t)ext_ip_len;
+                tptr+=(uint8_t)ext_ip_len;
             }
             break;
 

diff --git a/print-juniper.c b/print-juniper.c
index ba6c94a4ad21cd8a40b9f7ab8068c11bae36faef..7ee82dc22dd5b0443ee0e7856aff7b0bdcb2eefc 100644 (file)
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -429,7 +429,7 @@ struct juniper_l2info_t {
     uint8_t cookie_len;
     uint8_t cookie_type;
     uint8_t cookie[8];
-    uint8_t bundle;
+    u_int bundle;
     uint16_t proto;
     uint8_t flags;
 };

diff --git a/print-ldp.c b/print-ldp.c
index 653ea37cbd5135018a54480aa67e63ccf0386b78..19e87b7f718960d4815cb6e53007b61040b3e23b 100644 (file)
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -236,7 +236,7 @@ static int ldp_pdu_print(netdissect_options *, const u_char *);
 static u_int
 ldp_tlv_print(netdissect_options *ndo,
               const u_char *tptr,
-              u_short msg_tlen)
+              u_int msg_tlen)
 {
     struct ldp_tlv_header {
         nd_uint16_t type;

diff --git a/print-lldp.c b/print-lldp.c
index a16e08417df1f15b9ba7f1f07b43c52359d49059..9445f702f84868f3c8e185638230399f4f774e04 100644 (file)
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -1163,7 +1163,7 @@ lldp_private_dcbx_print(netdissect_options *ndo,
 {
     int hexdump = FALSE;
     u_int subtype;
-    uint8_t tval;
+    uint16_t tval;
     uint16_t tlv;
     uint32_t i, pgval, uval;
     u_int tlen, tlv_type;

diff --git a/print-rsvp.c b/print-rsvp.c
index ed9373765509afdb99ea183624e625fe5ffd21d4..17dd7358da97fe9137377ec0c960bfaca955cb06 100644 (file)
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -490,7 +490,7 @@ static const struct tok rsvp_obj_generalized_uni_values[] = {
  */
 static u_int
 rsvp_intserv_print(netdissect_options *ndo,
-                   const u_char *tptr, u_short obj_tlen)
+                   const u_char *tptr, u_int obj_tlen)
 {
     u_int parameter_id,parameter_length;
     union {
@@ -681,7 +681,7 @@ rsvp_obj_print(netdissect_options *ndo,
        float f;
        uint32_t i;
     } bw;
-    uint8_t namelen;
+    u_int namelen;
 
     u_int action, subchannel;
 

diff --git a/print-udp.c b/print-udp.c
index 646d414237b2f486625b0d40ada973385af511e3..7ad5cd9165de7077e741bbd359fe7d712eb49adb 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -354,8 +354,8 @@ udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dpo
                } else {
                        if (sport != -1) {
                                ND_PRINT("%s > %s: ",
-                                       udpport_string(ndo, sport),
-                                       udpport_string(ndo, dport));
+                                       udpport_string(ndo, (uint16_t)sport),
+                                       udpport_string(ndo, (uint16_t)dport));
                        }
                }
        } else {