Finish the pruning of unsupported OSes.

[tcpdump] / print-nfs.c

diff --git a/print-nfs.c b/print-nfs.c
index 1d48ee14a4f93dab1a9c001f68549d89f2abb832..bbce49536f2acf653179c742e85bccc4d324c534 100644 (file)
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -896,17 +896,19 @@ nfs_printfh(netdissect_options *ndo,
                if (spacep)
                        *spacep = '\0';
 
-               ND_PRINT(" fh %s/", temp);
+               ND_PRINT(" fh ");
+               fn_print_str(ndo, (const u_char *)temp);
+               ND_PRINT("/");
        } else {
                ND_PRINT(" fh %u,%u/",
                             fsid.Fsid_dev.Major, fsid.Fsid_dev.Minor);
        }
 
-       if(fsid.Fsid_dev.Minor == 257)
+       if(fsid.Fsid_dev.Minor == UINT_MAX && fsid.Fsid_dev.Major == UINT_MAX)
                /* Print the undecoded handle */
-               ND_PRINT("%s", fsid.Opaque_Handle);
+               fn_print_str(ndo, (const u_char *)fsid.Opaque_Handle);
        else
-               ND_PRINT("%ld", (long) ino);
+               ND_PRINT("%u", ino);
 }
 
 /*
@@ -970,8 +972,7 @@ xid_map_enter(netdissect_options *ndo,
                                 sizeof(ip->ip_src));
                UNALIGNED_MEMCPY(&xmep->server, ip->ip_dst,
                                 sizeof(ip->ip_dst));
-       }
-       else if (ip6) {
+       } else if (ip6) {
                xmep->ipver = 6;
                UNALIGNED_MEMCPY(&xmep->client, ip6->ip6_src,
                                 sizeof(ip6->ip6_src));
@@ -1559,7 +1560,7 @@ interp_reply(netdissect_options *ndo,
                if (dp == NULL)
                        goto trunc;
                if (v3) {
-                       if (parsewccres(ndo, dp, ndo->ndo_vflag, &nfserr) == 0)
+                       if (parsewccres(ndo, dp, ndo->ndo_vflag, &nfserr) == NULL)
                                goto trunc;
                } else {
                        if (parseattrstat(ndo, dp, !ndo->ndo_qflag, 0, &nfserr) == 0)