From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 10 Apr 2019 21:14:56 +0000 (-0700)
Subject: Remove some "always TRUE" comparisons reported by clang 6.0 on FBSD.
X-Git-Tag: stable-11.0.0~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f9bd0c6a39a266854fad680d2251c024c309425;p=thirdparty%2Fopen-vm-tools.git

Remove some "always TRUE" comparisons reported by clang 6.0 on FBSD.

A recent refactoring of HGFS fuse code to avoid taking the address of
a field in a packed structure introduced a comparision of an array
address != NULL which will always evaluate to "true".  Removing the
unnecessary "if" statements.
---

diff --git a/open-vm-tools/vmhgfs-fuse/fsutil.c b/open-vm-tools/vmhgfs-fuse/fsutil.c
index af85c4051..4363ea36b 100644
--- a/open-vm-tools/vmhgfs-fuse/fsutil.c
+++ b/open-vm-tools/vmhgfs-fuse/fsutil.c
@@ -209,19 +209,18 @@ HgfsPackGetattrRequest(HgfsReq *req,            // IN/OUT: Request buffer
       requestV3->reserved = 0;
       reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize();
       reqBufferSize = HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize);
-      if (requestV3->fileName.name != NULL) {
-         /* Convert to CP name. */
-         result = CPName_ConvertTo(path,
-                                   reqBufferSize,
-                                   requestV3->fileName.name);
-         LOG(8, ("Converted path %s\n", requestV3->fileName.name));
-         if (result < 0) {
-            LOG(8, ("CP conversion failed.\n"));
-            result = -EINVAL;
-            goto out;
-         }
-         requestV3->fileName.length = result;
+
+      /* Convert to CP name. */
+      result = CPName_ConvertTo(path,
+                                reqBufferSize,
+                                requestV3->fileName.name);
+      LOG(8, ("Converted path %s\n", requestV3->fileName.name));
+      if (result < 0) {
+         LOG(8, ("CP conversion failed.\n"));
+         result = -EINVAL;
+         goto out;
       }
+      requestV3->fileName.length = result;
       break;
    }
 
@@ -234,19 +233,18 @@ HgfsPackGetattrRequest(HgfsReq *req,            // IN/OUT: Request buffer
       requestV2->hints = 0;
       reqSize = sizeof *requestV2;
       reqBufferSize = HGFS_NAME_BUFFER_SIZE(HGFS_LARGE_PACKET_MAX, requestV2);
-      if (requestV2->fileName.name != NULL) {
-         /* Convert to CP name. */
-         result = CPName_ConvertTo(path,
-                                   reqBufferSize,
-                                   requestV2->fileName.name);
-         LOG(8, ("Converted path %s\n", requestV2->fileName.name));
-         if (result < 0) {
-            LOG(8, ("CP conversion failed.\n"));
-            result = -EINVAL;
-            goto out;
-         }
-         requestV2->fileName.length = result;
+
+      /* Convert to CP name. */
+      result = CPName_ConvertTo(path,
+                                reqBufferSize,
+                                requestV2->fileName.name);
+      LOG(8, ("Converted path %s\n", requestV2->fileName.name));
+      if (result < 0) {
+         LOG(8, ("CP conversion failed.\n"));
+         result = -EINVAL;
+         goto out;
       }
+      requestV2->fileName.length = result;
       break;
    }
 
@@ -255,19 +253,18 @@ HgfsPackGetattrRequest(HgfsReq *req,            // IN/OUT: Request buffer
       requestV1 = (HgfsRequestGetattr *)(HGFS_REQ_PAYLOAD(req));
       reqSize = sizeof *requestV1;
       reqBufferSize = HGFS_NAME_BUFFER_SIZE(HGFS_LARGE_PACKET_MAX, requestV1);
-      if (requestV1->fileName.name != NULL) {
-         /* Convert to CP name. */
-         result = CPName_ConvertTo(path,
-                                   reqBufferSize,
-                                   requestV1->fileName.name);
-         LOG(8, ("Converted path %s\n", requestV1->fileName.name));
-         if (result < 0) {
-            LOG(8, ("CP conversion failed.\n"));
-            result = -EINVAL;
-            goto out;
-         }
-         requestV1->fileName.length = result;
+
+      /* Convert to CP name. */
+      result = CPName_ConvertTo(path,
+                                reqBufferSize,
+                                requestV1->fileName.name);
+      LOG(8, ("Converted path %s\n", requestV1->fileName.name));
+      if (result < 0) {
+         LOG(8, ("CP conversion failed.\n"));
+         result = -EINVAL;
+         goto out;
       }
+      requestV1->fileName.length = result;
       break;
    }
 
diff --git a/open-vm-tools/vmhgfs-fuse/vmhgfs_version.h b/open-vm-tools/vmhgfs-fuse/vmhgfs_version.h
index bb3d38bdf..30478abfc 100644
--- a/open-vm-tools/vmhgfs-fuse/vmhgfs_version.h
+++ b/open-vm-tools/vmhgfs-fuse/vmhgfs_version.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2013,2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 2013,2018-2019 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -25,8 +25,8 @@
 #ifndef _VMHGFS_VERSION_H_
 #define _VMHGFS_VERSION_H_
 
-#define VMHGFS_DRIVER_VERSION          1.6.7.0
-#define VMHGFS_DRIVER_VERSION_COMMAS   1,6,7,0
-#define VMHGFS_DRIVER_VERSION_STRING   "1.6.7.0"
+#define VMHGFS_DRIVER_VERSION          1.6.8.0
+#define VMHGFS_DRIVER_VERSION_COMMAS   1,6,8,0
+#define VMHGFS_DRIVER_VERSION_STRING   "1.6.8.0"
 
 #endif /* _VMHGFS_VERSION_H_ */