Remove no more used ND_TTEST() macro

[tcpdump] / print-nfs.c

diff --git a/print-nfs.c b/print-nfs.c
index d49693da2d45762a22674b4f33c279d0932f8788..1ea895bdd2b250a88ebc366501e155379af80831 100644 (file)
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -333,11 +333,11 @@ nfsreply_print(netdissect_options *ndo,
        if (!ndo->ndo_nflag) {
                strlcpy(srcid, "nfs", sizeof(srcid));
                snprintf(dstid, sizeof(dstid), "%u",
-                   EXTRACT_BE_U_4(&rp->rm_xid));
+                   EXTRACT_BE_U_4(rp->rm_xid));
        } else {
                snprintf(srcid, sizeof(srcid), "%u", NFS_PORT);
                snprintf(dstid, sizeof(dstid), "%u",
-                   EXTRACT_BE_U_4(&rp->rm_xid));
+                   EXTRACT_BE_U_4(rp->rm_xid));
        }
        print_nfsaddr(ndo, bp2, srcid, dstid);
 
@@ -899,7 +899,7 @@ xid_map_enter(netdissect_options *ndo,
        const struct ip6_hdr *ip6 = NULL;
        struct xid_map_entry *xmep;
 
-       if (!ND_TTEST(rp->rm_call.cb_proc))
+       if (!ND_TTEST_4(rp->rm_call.cb_proc))
                return (0);
        switch (IP_V((const struct ip *)bp)) {
        case 4: