From: VMware, Inc <>
Date: Thu, 17 Jun 2010 21:31:29 +0000 (-0700)
Subject: lib/lock: clean up
X-Git-Tag: 2010.06.16-268169~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b5c9fcf97184eb2c5995cd641e2e6bf3b7220a8;p=thirdparty%2Fopen-vm-tools.git

lib/lock: clean up

Finally getting around to simplifying the logic based on review
comments.

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

diff --git a/open-vm-tools/lib/lock/ulCondVar.c b/open-vm-tools/lib/lock/ulCondVar.c
index 9ad2ba735..1e8057824 100644
--- a/open-vm-tools/lib/lock/ulCondVar.c
+++ b/open-vm-tools/lib/lock/ulCondVar.c
@@ -112,10 +112,10 @@ MXUserNativeCVSupported(void)
                                    GetProcAddress(kernel32,
                                                    "WakeConditionVariable");
 
-         result = ((pInitializeConditionVariable == NULL) ||
-                   (pSleepConditionVariableCS == NULL) ||
-                   (pWakeAllConditionVariable == NULL) ||
-                   (pWakeConditionVariable == NULL)) ? FALSE : TRUE;
+         result = ((pInitializeConditionVariable != NULL) &&
+                   (pSleepConditionVariableCS != NULL) &&
+                   (pWakeAllConditionVariable != NULL) &&
+                   (pWakeConditionVariable != NULL));
 
       } else {
          result = FALSE;
diff --git a/open-vm-tools/lib/lock/ulRW.c b/open-vm-tools/lib/lock/ulRW.c
index 83a1f1e60..5a57596e5 100644
--- a/open-vm-tools/lib/lock/ulRW.c
+++ b/open-vm-tools/lib/lock/ulRW.c
@@ -87,11 +87,11 @@ MXUserNativeRWSupported(void)
                                     GetProcAddress(kernel32,
                                                    "ReleaseSRWLockExclusive");
 
-         result = ((pInitializeSRWLock == NULL) ||
-                   (pAcquireSRWLockShared == NULL) ||
-                   (pAcquireSRWLockExclusive == NULL) ||
-                   (pReleaseSRWLockShared == NULL) ||
-                   (pReleaseSRWLockExclusive == NULL)) ? FALSE : TRUE;
+         result = ((pInitializeSRWLock != NULL) &&
+                   (pAcquireSRWLockShared != NULL) &&
+                   (pReleaseSRWLockShared != NULL) &&
+                   (pAcquireSRWLockExclusive != NULL) &&
+                   (pReleaseSRWLockExclusive != NULL));
       } else {
          result = FALSE;
       }