From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:17 +0000 (-0700)
Subject: lib/file: consistent style
X-Git-Tag: stable-10.2.0~414
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48cc781074c88ed5347ee0a809f2e1d22c9fee7d;p=thirdparty%2Fopen-vm-tools.git

lib/file: consistent style
---

diff --git a/open-vm-tools/lib/file/fileTempPosix.c b/open-vm-tools/lib/file/fileTempPosix.c
index dbbb1ccc7..ae4d6861a 100644
--- a/open-vm-tools/lib/file/fileTempPosix.c
+++ b/open-vm-tools/lib/file/fileTempPosix.c
@@ -409,7 +409,7 @@ FileCreateSafeTmpDir(uid_t userId,            // IN:
                             PRODUCT_GENERIC_NAME_LOWER, userName,
                             FileSimpleRandom());
 
-      if (!tmpDir) {
+      if (tmpDir == NULL) {
          Warning("%s: Out of memory error.\n", __FUNCTION__);
          break;
       }
@@ -497,21 +497,21 @@ File_GetSafeTmpDir(Bool useConf)  // IN:
    /* We don't have a useable temporary dir, create one. */
    baseTmpDir = FileGetTmpDir(useConf);
 
-   if (!baseTmpDir) {
+   if (baseTmpDir == NULL) {
       Warning("%s: FileGetTmpDir failed.\n", __FUNCTION__);
       goto exit;
    }
 
    userName = FileGetUserName(userId);
 
-   if (!userName) {
+   if (userName == NULL) {
       Warning("%s: FileGetUserName failed, using numeric ID "
               "as username instead.\n", __FUNCTION__);
 
       /* Fallback on just using the userId as the username. */
       userName = Str_Asprintf(NULL, "uid-%d", userId);
 
-      if (!userName) {
+      if (userName == NULL) {
          Warning("%s: Str_Asprintf error.\n", __FUNCTION__);
          goto exit;
       }
@@ -520,7 +520,7 @@ File_GetSafeTmpDir(Bool useConf)  // IN:
    tmpDir = Str_Asprintf(NULL, "%s%s%s-%s", baseTmpDir, DIRSEPS,
                          PRODUCT_GENERIC_NAME_LOWER, userName);
 
-   if (!tmpDir) {
+   if (tmpDir == NULL) {
       Warning("%s: Out of memory error.\n", __FUNCTION__);
       goto exit;
    }
@@ -536,7 +536,7 @@ File_GetSafeTmpDir(Bool useConf)  // IN:
 
       tmpDir = FileFindExistingSafeTmpDir(userId, userName, baseTmpDir);
 
-      if (!tmpDir) {
+      if (tmpDir == NULL) {
          /*
           * We didn't find any usable directories, so try to create one now.
           */
@@ -545,7 +545,7 @@ File_GetSafeTmpDir(Bool useConf)  // IN:
       }
    }
 
-   if (tmpDir) {
+   if (tmpDir != NULL) {
       /*
        * We have successfully created a temporary directory, remember it for
        * future calls.