X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/9169e4e1949c3fa879f0a2f98cfbd8c444743c27..15b38a333fd93e3e7ab76b39a6a6b391c07c9e99:/print-decnet.c diff --git a/print-decnet.c b/print-decnet.c index d39a768a..6a6dd259 100644 --- a/print-decnet.c +++ b/print-decnet.c @@ -52,7 +52,7 @@ typedef nd_uint32_t longword; /* 4 bytes field */ * Definitions for DECNET Phase IV protocol headers */ typedef union { - nd_byte dne_addr[MAC_ADDR_LEN]; /* full Ethernet address */ + nd_mac_addr dne_addr; /* full Ethernet address */ struct { nd_byte dne_hiord[4]; /* DECnet HIORD prefix */ nd_byte dne_nodeaddr[2]; /* DECnet node address */ @@ -478,13 +478,13 @@ decnet_print(netdissect_options *ndo, ndo->ndo_protocol = "decnet"; if (length < sizeof(struct shorthdr)) { - ND_PRINT(" (length %u < %u)", length, (unsigned)sizeof(struct shorthdr)); + ND_PRINT(" (length %u < %zu)", length, sizeof(struct shorthdr)); goto invalid; } pktlen = GET_LE_U_2(ap); if (pktlen < sizeof(struct shorthdr)) { - ND_PRINT(" (pktlen %u < %u)", pktlen, (unsigned)sizeof(struct shorthdr)); + ND_PRINT(" (pktlen %u < %zu)", pktlen, sizeof(struct shorthdr)); goto invalid; } if (pktlen > length) { @@ -529,7 +529,7 @@ decnet_print(netdissect_options *ndo, switch (mflags & RMF_MASK) { case RMF_LONG: if (length < sizeof(struct longhdr)) { - ND_PRINT(" (length %u < %u)", length, (unsigned)sizeof(struct longhdr)); + ND_PRINT(" (length %u < %zu)", length, sizeof(struct longhdr)); goto invalid; } ND_TCHECK_SIZE(&rhp->rh_long); @@ -799,7 +799,7 @@ print_nsp(netdissect_options *ndo, u_int dst, src, flags; if (nsplen < sizeof(struct nsphdr)) { - ND_PRINT(" (nsplen %u < %u)", nsplen, (unsigned)sizeof(struct nsphdr)); + ND_PRINT(" (nsplen %u < %zu)", nsplen, sizeof(struct nsphdr)); goto invalid; } flags = GET_U_1(nsphp->nh_flags);