NFS: Delete dead code

Since  commit f2eaaa35725c6cb52e9e3947769fc6e7f2579dee in year 2000
the typedef struct my_fsid has a field 'char Opaque_Handle[2 * 32 + 1];'

Thus sizeof(*fsidp) is > 14.
Delete the else block as dead code and the two useless if.

This should remove two Visual Studio warnings:
parsenfsfh.c(318,25): warning C4127: conditional expression is constant
parsenfsfh.c(319,22): warning C4127: conditional expression is constant

diff --git a/parsenfsfh.c b/parsenfsfh.c
index d9e7b6f61f028e97402b346e7f3d8ff64452dca8..8b13f525bce34ba7b390dd5d5c7941f80ede06a8 100644 (file)
--- a/parsenfsfh.c
+++ b/parsenfsfh.c
@@ -315,20 +315,9 @@ Parse_fh(netdissect_options *ndo, const unsigned char *fh, u_int len,
 
        case FHT_VMSUCX:
            /* No numeric file system ID, so hash on the device-name */
 
        case FHT_VMSUCX:
            /* No numeric file system ID, so hash on the device-name */

-           if (sizeof(*fsidp) >= 14) {
-               if (sizeof(*fsidp) > 14)
-                   memset((char *)fsidp, 0, sizeof(*fsidp));
-               /* just use the whole thing */
-               memcpy((char *)fsidp, (const char *)fh, 14);
-           } else {
-               uint32_t tempa[4];      /* at least 16 bytes, maybe more */
-
-               memset((char *)tempa, 0, sizeof(tempa));
-               memcpy((char *)tempa, (const char *)fh, 14); /* ensure alignment */
-               fsidp->Fsid_dev.Minor = tempa[0] + (tempa[1]<<1);
-               fsidp->Fsid_dev.Major = tempa[2] + (tempa[3]<<1);
-               fsidp->fsid_code = 0;
-           }
+           memset((char *)fsidp, 0, sizeof(*fsidp));
+           /* just use the whole thing */
+           memcpy((char *)fsidp, (const char *)fh, 14);

 
            /* VMS file ID is: (RVN, FidHi, FidLo) */
            *inop = (((uint32_t) GET_U_1(fhp + 26)) << 24) |
 
            /* VMS file ID is: (RVN, FidHi, FidLo) */
            *inop = (((uint32_t) GET_U_1(fhp + 26)) << 24) |