Force -t on in TESTonce.

[tcpdump] / print-nfs.c

diff --git a/print-nfs.c b/print-nfs.c
index c3158057b84b0f0985f767641178b1318d107455..a71e068da6888e2dfca7255ef926837575959d6c 100644 (file)
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -54,7 +54,7 @@ static const uint32_t *parse_post_op_attr(netdissect_options *, const uint32_t *
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */
-uint32_t nfsv3_procid[NFS_NPROCS] = {
+static uint32_t nfsv3_procid[NFS_NPROCS] = {
        NFSPROC_NULL,
        NFSPROC_GETATTR,
        NFSPROC_SETATTR,
@@ -653,12 +653,12 @@ nfsreq_print_noaddr(netdissect_options *ndo,
                break;
 
        case NFSPROC_SYMLINK:
-               if ((dp = parsereq(ndo, rp, length)) != 0 &&
-                   (dp = parsefhn(ndo, dp, v3)) != 0) {
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   (dp = parsefhn(ndo, dp, v3)) != NULL) {
                        ND_PRINT((ndo, " ->"));
-                       if (v3 && (dp = parse_sattr3(ndo, dp, &sa3)) == 0)
+                       if (v3 && (dp = parse_sattr3(ndo, dp, &sa3)) == NULL)
                                break;
-                       if (parsefn(ndo, dp) == 0)
+                       if (parsefn(ndo, dp) == NULL)
                                break;
                        if (v3 && ndo->ndo_vflag)
                                print_sattr3(ndo, &sa3, ndo->ndo_vflag);
@@ -667,12 +667,12 @@ nfsreq_print_noaddr(netdissect_options *ndo,
                break;
 
        case NFSPROC_MKNOD:
-               if ((dp = parsereq(ndo, rp, length)) != 0 &&
-                   (dp = parsefhn(ndo, dp, v3)) != 0) {
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   (dp = parsefhn(ndo, dp, v3)) != NULL) {
                        ND_TCHECK(*dp);
                        type = (nfs_type)EXTRACT_32BITS(dp);
                        dp++;
-                       if ((dp = parse_sattr3(ndo, dp, &sa3)) == 0)
+                       if ((dp = parse_sattr3(ndo, dp, &sa3)) == NULL)
                                break;
                        ND_PRINT((ndo, " %s", tok2str(type2str, "unk-ft %d", type)));
                        if (ndo->ndo_vflag && (type == NFCHR || type == NFBLK)) {
@@ -855,10 +855,10 @@ struct xid_map_entry {
 
 #define        XIDMAPSIZE      64
 
-struct xid_map_entry xid_map[XIDMAPSIZE];
+static struct xid_map_entry xid_map[XIDMAPSIZE];
 
-int    xid_map_next = 0;
-int    xid_map_hint = 0;
+static int xid_map_next = 0;
+static int xid_map_hint = 0;
 
 static int
 xid_map_enter(netdissect_options *ndo,
@@ -1344,7 +1344,7 @@ parsewccres(netdissect_options *ndo,
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
-       return parse_wcc_data(ndo, dp, verbose) != 0;
+       return parse_wcc_data(ndo, dp, verbose) != NULL;
 }
 
 static const uint32_t *
@@ -1576,7 +1576,7 @@ interp_reply(netdissect_options *ndo,
                if (!(dp = parserep(ndo, rp, length)))
                        break;
                if (v3) {
-                       if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != 0)
+                       if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != NULL)
                                return;
                } else {
                        if (parsediropres(ndo, dp) != 0)
@@ -1588,10 +1588,10 @@ interp_reply(netdissect_options *ndo,
                if (!(dp = parserep(ndo, rp, length)))
                        break;
                if (v3) {
-                       if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != 0)
+                       if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != NULL)
                                return;
                } else {
-                       if (parsestatus(ndo, dp, &er) != 0)
+                       if (parsestatus(ndo, dp, &er) != NULL)
                                return;
                }
                break;
@@ -1599,7 +1599,7 @@ interp_reply(netdissect_options *ndo,
        case NFSPROC_MKNOD:
                if (!(dp = parserep(ndo, rp, length)))
                        break;
-               if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != 0)
+               if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != NULL)
                        return;
                break;
 
@@ -1611,7 +1611,7 @@ interp_reply(netdissect_options *ndo,
                        if (parsewccres(ndo, dp, ndo->ndo_vflag))
                                return;
                } else {
-                       if (parsestatus(ndo, dp, &er) != 0)
+                       if (parsestatus(ndo, dp, &er) != NULL)
                                return;
                }
                break;
@@ -1632,7 +1632,7 @@ interp_reply(netdissect_options *ndo,
                        }
                        return;
                } else {
-                       if (parsestatus(ndo, dp, &er) != 0)
+                       if (parsestatus(ndo, dp, &er) != NULL)
                                return;
                }
                break;
@@ -1653,7 +1653,7 @@ interp_reply(netdissect_options *ndo,
                                return;
                        }
                } else {
-                       if (parsestatus(ndo, dp, &er) != 0)
+                       if (parsestatus(ndo, dp, &er) != NULL)
                                return;
                }
                break;