From: VMware, Inc <>
Date: Thu, 22 Dec 2011 00:36:35 +0000 (-0800)
Subject: lib/file: clean up before a change
X-Git-Tag: 2011.12.20-562307~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=719ccc3e5035e9da117fc3af0cd0fb396f42524b;p=thirdparty%2Fopen-vm-tools.git

lib/file: clean up before a change

Make the new code more consistent with the existing code.

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 f347b750c..bf98721c6 100644
--- a/open-vm-tools/lib/file/fileLockPrimitive.c
+++ b/open-vm-tools/lib/file/fileLockPrimitive.c
@@ -1898,14 +1898,15 @@ FileLockIsLockedMandatory(ConstUnicode lockFile,  // IN:
     * Check for lock by actually locking file, and dropping
     * lock quickly if open was successful.
     */
+
    access = FILEIO_OPEN_ACCESS_READ | FILEIO_OPEN_ACCESS_WRITE |
             FILEIO_OPEN_EXCLUSIVE_LOCK;
-   result = FileIOCreateRetry(&desc, lockFile, access,
-                              FILEIO_OPEN, 0644,
-                              0);
+
+   result = FileIOCreateRetry(&desc, lockFile, access, FILEIO_OPEN, 0644, 0);
+
    if (FileIO_IsSuccess(result)) {
-      Bool ret;
-      ret = FileIO_Close(&desc);
+      Bool ret = FileIO_Close(&desc);
+
       ASSERT(!ret);
       return FALSE;
    } else if (result == FILEIO_LOCK_FAILED) {
@@ -1914,6 +1915,7 @@ FileLockIsLockedMandatory(ConstUnicode lockFile,  // IN:
       return FALSE;  // no lock file means unlocked
    } else {
       *err = FileMapErrorToErrno(__FUNCTION__, Err_Errno());
+
       return FALSE;
    }
 }