From: VMware, Inc <>
Date: Thu, 22 Dec 2011 00:36:53 +0000 (-0800)
Subject: lib/file: IsLocked err argument is optional
X-Git-Tag: 2011.12.20-562307~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7fdddda417332c648e189d386bacbe383d782ec;p=thirdparty%2Fopen-vm-tools.git

lib/file: IsLocked err argument is optional

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/file/fileLockPrimitive.c b/open-vm-tools/lib/file/fileLockPrimitive.c
index bf98721c6..9df2b3cc2 100644
--- a/open-vm-tools/lib/file/fileLockPrimitive.c
+++ b/open-vm-tools/lib/file/fileLockPrimitive.c
@@ -1886,7 +1886,7 @@ FileLockIntrinsic(ConstUnicode pathName,   // IN:
 
 static Bool
 FileLockIsLockedMandatory(ConstUnicode lockFile,  // IN:
-                          int *err)               // OUT:
+                          int *err)               // OUT/OPT:
 {
    int access;
    FileIOResult result;
@@ -1914,7 +1914,9 @@ FileLockIsLockedMandatory(ConstUnicode lockFile,  // IN:
    } else if (result == FILEIO_FILE_NOT_FOUND) {
       return FALSE;  // no lock file means unlocked
    } else {
-      *err = FileMapErrorToErrno(__FUNCTION__, Err_Errno());
+      if (err != NULL) {
+         *err = FileMapErrorToErrno(__FUNCTION__, Err_Errno());
+      }
 
       return FALSE;
    }
@@ -1946,7 +1948,7 @@ FileLockIsLockedMandatory(ConstUnicode lockFile,  // IN:
 
 static Bool
 FileLockIsLockedPortable(ConstUnicode lockDir,  // IN:
-                         int *err)              // OUT:
+                         int *err)              // OUT/OPT:
 {
    uint32 i;
    int numEntries;
@@ -1960,9 +1962,11 @@ FileLockIsLockedPortable(ConstUnicode lockDir,  // IN:
        * If the lock directory doesn't exist, we should not count this
        * as an error.  This is expected if the file isn't locked.
        */
+
       if (err != NULL) {
          *err = errno;
       }
+
       return FALSE;
    }
 
@@ -2001,7 +2005,7 @@ FileLockIsLockedPortable(ConstUnicode lockDir,  // IN:
 
 Bool
 FileLockIsLocked(ConstUnicode pathName,  // IN:
-                 int *err)               // OUT:
+                 int *err)               // OUT/OPT:
 {
    Unicode lockBase = Unicode_Append(pathName, FILELOCK_SUFFIX);
    Bool isLocked;