the failed/passed count was not kept in the right place

[tcpdump] / print-decnet.c

diff --git a/print-decnet.c b/print-decnet.c
index fcb85225750c95f530cf1724137bbcf053031167..31166e3f31df60d09924d7563a332da562642760 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -502,7 +502,8 @@ decnet_print(netdissect_options *ndo,
 {
        const union routehdr *rhp;
        u_int mflags;
-       u_int dst, src, hops;
+       uint16_t dst, src;
+       u_int hops;
        u_int nsplen, pktlen;
        const u_char *nspp;
 
@@ -617,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;
@@ -1243,7 +1245,7 @@ dnnum_string(netdissect_options *ndo, u_short dnaddr)
        str = (char *)malloc(siz = sizeof("00.0000"));
        if (str == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "dnnum_string: malloc");
-       nd_snprintf(str, siz, "%u.%u", area, node);
+       snprintf(str, siz, "%u.%u", area, node);
        return(str);
 }