From: Guy Harris Date: Thu, 18 Apr 2019 03:21:53 +0000 (-0700) Subject: Squelch more warnings. X-Git-Tag: tcpdump-4.99-bp~829 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/dc9744f7c6f1aa8f676f84829ee9a69a52952f94 Squelch more warnings. --- diff --git a/print-babel.c b/print-babel.c index 00dcd14c..f01fbc33 100644 --- 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 a58041b7..a82dc8fe 100644 --- 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 fede229d..2a6c1e3a 100644 --- 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;irh_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 ddc917d5..3478de17 100644 --- 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 f8d23490..37a17cc8 100644 --- 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 5ccd0b34..43925c2a 100644 --- 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 ba6c94a4..7ee82dc2 100644 --- 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 653ea37c..19e87b7f 100644 --- 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 a16e0841..9445f702 100644 --- 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 ed937376..17dd7358 100644 --- 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 646d4142..7ad5cd91 100644 --- 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 {