From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Tue, 7 Jan 2025 19:21:12 +0000 (+0100)
Subject: NFS: Delete dead code
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/431bdb5c365360d61968e7fa02322825b1da4208

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 d9e7b6f6..8b13f525 100644
--- 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 */
-	    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) |