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 9ad2ba735a95bbfa283a1433ca9d873becccdd2c..1e80578247cd9cd5a44c67ba8dc582a24c84c4b3 100644 (file)
--- 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 83a1f1e60923735319efb7c2e6eb8d9f6408d784..5a57596e55a916dbd523550d38650a0a784aa2ac 100644 (file)
--- 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;
       }