Clean up and make consistent [trivial]

Make the ASSERTs consitent in their coding; clean up a few things.

diff --git a/open-vm-tools/lib/file/filePosix.c b/open-vm-tools/lib/file/filePosix.c
index 84e0e51cbbaae6799aa20e1c9b50a326bee818b0..24aa3a4549f7210d6cfeac0d311db5addb174127 100644 (file)
--- a/open-vm-tools/lib/file/filePosix.c
+++ b/open-vm-tools/lib/file/filePosix.c
@@ -1077,8 +1077,7 @@ FileGetStats(const char *pathName,       // IN:
    Bool retval = TRUE;
    char *dupPath = NULL;
 
-   while (Posix_Statfs(dupPath ? dupPath : pathName,
-                             pstatfsbuf) == -1) {
+   while (Posix_Statfs(dupPath ? dupPath : pathName, pstatfsbuf) == -1) {
       if (errno != ENOENT || doNotAscend) {
          retval = FALSE;
          break;

diff --git a/open-vm-tools/lib/lock/ul.c b/open-vm-tools/lib/lock/ul.c
index f2cb4f0326ca718482e8921cc8f63b122939bd4c..14c8d4b62e5219099f8c944a064e29fb15f20ea6 100644 (file)
--- a/open-vm-tools/lib/lock/ul.c
+++ b/open-vm-tools/lib/lock/ul.c
@@ -200,7 +200,7 @@ MXUserSyndrome(void)
       syndrome = Atomic_Read(&syndromeMem);
    }
 
-   ASSERT(syndrome);
+   ASSERT(syndrome != 0);
 
    return syndrome;
 }
@@ -240,7 +240,7 @@ MXUserGetSignature(MXUserObjectType objectType)  // IN:
 
    signature = (MXUserSyndrome() & 0x0FFFFFFF) | (objectType << 28);
 
-   ASSERT(signature);
+   ASSERT(signature != 0);
 
    return signature;
 }
@@ -458,7 +458,7 @@ MXUserAllocPerThread(void)
    MXUserPerThread *perThread;
    MXRecLock *perThreadLock = MXUserInternalSingleton(&perThreadLockMem);
 
-   ASSERT(perThreadLock);
+   ASSERT(perThreadLock != NULL);
 
    MXRecLockAcquire(perThreadLock,
                     NULL);          // non-stats
@@ -472,7 +472,7 @@ MXUserAllocPerThread(void)
 
    MXRecLockRelease(perThreadLock);
 
-   ASSERT(perThread);
+   ASSERT(perThread != NULL);
 
    memset(perThread, 0, sizeof *perThread);  // ensure all zeros
 
@@ -503,11 +503,11 @@ MXUserFreePerThread(MXUserPerThread *perThread)  // IN:
 {
    MXRecLock *perThreadLock;
 
-   ASSERT(perThread);
+   ASSERT(perThread != NULL);
    ASSERT(perThread->next == NULL);
 
    perThreadLock = MXUserInternalSingleton(&perThreadLockMem);
-   ASSERT(perThreadLock);
+   ASSERT(perThreadLock != NULL);
 
    MXRecLockAcquire(perThreadLock,
                     NULL);          // non-stats
@@ -563,7 +563,7 @@ MXUserGetPerThread(Bool mayAlloc)  // IN: alloc perThread if not present?
           */
 
          perThread = HashTable_LookupOrInsert(hash, tid, newEntry);
-         ASSERT(perThread);
+         ASSERT(perThread != NULL);
 
          if (perThread != newEntry) {
             MXUserFreePerThread(newEntry);
@@ -664,7 +664,7 @@ MXUserThreadRank(MXUserPerThread *perThread,  // IN:
    Bool foundOnce = TRUE;
    MX_Rank maxRank = RANK_UNRANKED;
 
-   ASSERT(perThread);
+   ASSERT(perThread != NULL);
 
    /*
     * Determine the maximum rank held. Note if the lock being acquired

diff --git a/open-vm-tools/lib/lock/ulBarrier.c b/open-vm-tools/lib/lock/ulBarrier.c
index 0216247ba4dbf37d113bfa769050cb08ad96097b..ed7e99ca586e51c6122745f2d6361b6d4d671a36 100644 (file)
--- a/open-vm-tools/lib/lock/ulBarrier.c
+++ b/open-vm-tools/lib/lock/ulBarrier.c
@@ -116,7 +116,7 @@ MXUser_CreateBarrier(const char *userName,  // IN: shall be known as
    char *properName;
    MXUserBarrier *barrier;
 
-   ASSERT(count);
+   ASSERT(count != 0);
 
    barrier = Util_SafeCalloc(1, sizeof *barrier);
 
@@ -218,7 +218,7 @@ MXUser_EnterBarrier(MXUserBarrier *barrier)  // IN/OUT:
    BarrierContext *ptr;
    uint32 context;
 
-   ASSERT(barrier);
+   ASSERT(barrier != NULL);
    MXUserValidateHeader(&barrier->header, MXUSER_TYPE_BARRIER);
 
    MXUser_AcquireExclLock(barrier->lock);
@@ -288,7 +288,7 @@ MXUser_CreateSingletonBarrier(Atomic_Ptr *barrierStorage,  // IN/OUT:
 {
    MXUserBarrier *barrier;
 
-   ASSERT(barrierStorage);
+   ASSERT(barrierStorage != NULL);
 
    barrier = Atomic_ReadPtr(barrierStorage);
 

diff --git a/open-vm-tools/lib/lock/ulCondVar.c b/open-vm-tools/lib/lock/ulCondVar.c
index abb1ba00d25583294d0c3d38c66a3a0a5c38b79f..4811b6c80555a0b9112f241c81edb7c098e0f1b8 100644 (file)
--- a/open-vm-tools/lib/lock/ulCondVar.c
+++ b/open-vm-tools/lib/lock/ulCondVar.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2010-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2010-2019 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -427,9 +427,9 @@ MXUserWaitCondVar(MXUserHeader *header,    // IN:
                   MXUserCondVar *condVar,  // IN/OUT:
                   uint32 waitTimeMsec)     // IN:
 {
-   ASSERT(header);
-   ASSERT(lock);
-   ASSERT(condVar);
+   ASSERT(header != NULL);
+   ASSERT(lock != NULL);
+   ASSERT(condVar != NULL);
    ASSERT(condVar->signature == MXUserGetSignature(MXUSER_TYPE_CONDVAR));
 
    if (condVar->ownerLock != lock) {
@@ -470,7 +470,7 @@ MXUser_SignalCondVar(MXUserCondVar *condVar)  // IN/OUT:
 {
    int err;
 
-   ASSERT(condVar);
+   ASSERT(condVar != NULL);
    ASSERT(condVar->signature == MXUserGetSignature(MXUSER_TYPE_CONDVAR));
 
    err = MXUserSignalInternal(condVar);
@@ -504,7 +504,7 @@ MXUser_BroadcastCondVar(MXUserCondVar *condVar)  // IN/OUT:
 {
    int err;
 
-   ASSERT(condVar);
+   ASSERT(condVar != NULL);
    ASSERT(condVar->signature == MXUserGetSignature(MXUSER_TYPE_CONDVAR));
 
    err = MXUserBroadcastInternal(condVar);

diff --git a/open-vm-tools/lib/lock/ulExcl.c b/open-vm-tools/lib/lock/ulExcl.c
index a0ad1c923e88cd751130969a2d997c52bd42c73f..1bb1943e160ac8bacc5c67547d8575089647683b 100644 (file)
--- a/open-vm-tools/lib/lock/ulExcl.c
+++ b/open-vm-tools/lib/lock/ulExcl.c
@@ -126,7 +126,7 @@ MXUser_EnableStatsExclLock(MXUserExclLock *lock,       // IN/OUT:
                            Bool trackAcquisitionTime,  // IN:
                            Bool trackHeldTime)         // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_EXCL);
 
    if (vmx86_stats) {
@@ -158,7 +158,7 @@ MXUser_EnableStatsExclLock(MXUserExclLock *lock,       // IN/OUT:
 Bool
 MXUser_DisableStatsExclLock(MXUserExclLock *lock)  // IN/OUT:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_EXCL);
 
    if (vmx86_stats) {
@@ -192,7 +192,7 @@ MXUser_SetContentionRatioFloorExclLock(MXUserExclLock *lock,  // IN/OUT:
 {
    Bool result;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_EXCL);
 
    if (vmx86_stats) {
@@ -228,7 +228,7 @@ MXUser_SetContentionCountFloorExclLock(MXUserExclLock *lock,  // IN/OUT:
 {
    Bool result;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_EXCL);
 
    if (vmx86_stats) {
@@ -264,7 +264,7 @@ MXUser_SetContentionDurationFloorExclLock(MXUserExclLock *lock,  // IN/OUT:
 {
    Bool result;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_EXCL);
 
    if (vmx86_stats) {
@@ -444,7 +444,7 @@ MXUser_DestroyExclLock(MXUserExclLock *lock)  // IN:
 void
 MXUser_AcquireExclLock(MXUserExclLock *lock)  // IN/OUT:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_EXCL);
 
    MXUserAcquisitionTracking(&lock->header, TRUE);
@@ -510,7 +510,7 @@ MXUser_AcquireExclLock(MXUserExclLock *lock)  // IN/OUT:
 void
 MXUser_ReleaseExclLock(MXUserExclLock *lock)  // IN/OUT:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_EXCL);
 
    if (vmx86_stats) {
@@ -574,7 +574,7 @@ MXUser_TryAcquireExclLock(MXUserExclLock *lock)  // IN/OUT:
 {
    Bool success;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_EXCL);
 
    if (MXUserTryAcquireFail(lock->header.name)) {
@@ -628,7 +628,7 @@ MXUser_TryAcquireExclLock(MXUserExclLock *lock)  // IN/OUT:
 Bool
 MXUser_IsCurThreadHoldingExclLock(MXUserExclLock *lock)  // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_EXCL);
 
    return MXRecLockIsOwner(&lock->recursiveLock);
@@ -661,7 +661,7 @@ MXUser_CreateSingletonExclLockInt(Atomic_Ptr *lockStorage,  // IN/OUT:
 {
    MXUserExclLock *lock;
 
-   ASSERT(lockStorage);
+   ASSERT(lockStorage != NULL);
 
    lock = Atomic_ReadPtr(lockStorage);
 
@@ -701,7 +701,7 @@ MXUser_CreateSingletonExclLockInt(Atomic_Ptr *lockStorage,  // IN/OUT:
 MXUserCondVar *
 MXUser_CreateCondVarExclLock(MXUserExclLock *lock)
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_EXCL);
 
    return MXUserCreateCondVar(&lock->header, &lock->recursiveLock);
@@ -731,7 +731,7 @@ void
 MXUser_WaitCondVarExclLock(MXUserExclLock *lock,    // IN:
                            MXUserCondVar *condVar)  // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_EXCL);
 
    MXUserWaitCondVar(&lock->header, &lock->recursiveLock, condVar,
@@ -763,7 +763,7 @@ MXUser_TimedWaitCondVarExclLock(MXUserExclLock *lock,    // IN:
                                 MXUserCondVar *condVar,  // IN:
                                 uint32 waitTimeMsec)     // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_EXCL);
 
    MXUserWaitCondVar(&lock->header, &lock->recursiveLock, condVar,

diff --git a/open-vm-tools/lib/lock/ulRW.c b/open-vm-tools/lib/lock/ulRW.c
index c94b4d7cb31d953d1ef3df37b62c0cf7c08621d3..402b50ace47cec9e36b39d3cc6f9d385df1ccc02 100644 (file)
--- a/open-vm-tools/lib/lock/ulRW.c
+++ b/open-vm-tools/lib/lock/ulRW.c
@@ -524,7 +524,7 @@ MXUserAcquisition(MXUserRWLock *lock,  // IN/OUT:
 {
    HolderContext *myContext;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_RW);
 
    MXUserAcquisitionTracking(&lock->header, TRUE);
@@ -697,7 +697,7 @@ MXUser_IsCurThreadHoldingRWLock(MXUserRWLock *lock,  // IN:
 {
    HolderContext *myContext;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_RW);
 
    myContext = MXUserGetHolderContext(lock);
@@ -739,7 +739,7 @@ MXUser_ReleaseRWLock(MXUserRWLock *lock)  // IN/OUT:
 {
    HolderContext *myContext;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_RW);
 
    myContext = MXUserGetHolderContext(lock);
@@ -828,7 +828,7 @@ MXUser_CreateSingletonRWLockInt(Atomic_Ptr *lockStorage,  // IN/OUT:
 {
    MXUserRWLock *lock;
 
-   ASSERT(lockStorage);
+   ASSERT(lockStorage != NULL);
 
    lock = Atomic_ReadPtr(lockStorage);
 

diff --git a/open-vm-tools/lib/lock/ulRec.c b/open-vm-tools/lib/lock/ulRec.c
index 8c5e129de35fcfdcb179782116ff6496760b3ab6..05f437acc54beb3eb1cdd22ee2578bba94a6e862 100644 (file)
--- a/open-vm-tools/lib/lock/ulRec.c
+++ b/open-vm-tools/lib/lock/ulRec.c
@@ -140,7 +140,7 @@ MXUser_EnableStatsRecLock(MXUserRecLock *lock,        // IN/OUT:
                           Bool trackAcquisitionTime,  // IN:
                           Bool trackHeldTime)         // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
 
    if (vmx86_stats) {
@@ -172,7 +172,7 @@ MXUser_EnableStatsRecLock(MXUserRecLock *lock,        // IN/OUT:
 Bool
 MXUser_DisableStatsRecLock(MXUserRecLock *lock)  // IN/OUT:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
 
    if (vmx86_stats) {
@@ -206,7 +206,7 @@ MXUser_SetContentionRatioFloorRecLock(MXUserRecLock *lock,  // IN/OUT:
 {
    Bool result;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
 
    if (vmx86_stats) {
@@ -242,7 +242,7 @@ MXUser_SetContentionCountFloorRecLock(MXUserRecLock *lock,  // IN/OUT:
 {
    Bool result;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
 
    if (vmx86_stats) {
@@ -278,7 +278,7 @@ MXUser_SetContentionDurationFloorRecLock(MXUserRecLock *lock,  // IN/OUT:
 {
    Bool result;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
 
    if (vmx86_stats) {
@@ -430,7 +430,7 @@ MXUser_CreateRecLock(const char *userName,  // IN:
 static void
 MXUserCondDestroyRecLock(MXUserRecLock *lock)  // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
    ASSERT(Atomic_Read(&lock->refCount) > 0);
 
@@ -488,7 +488,7 @@ MXUser_DestroyRecLock(MXUserRecLock *lock)  // IN:
 void
 MXUser_AcquireRecLock(MXUserRecLock *lock)  // IN/OUT:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
    ASSERT(Atomic_Read(&lock->refCount) > 0);
 
@@ -557,7 +557,7 @@ MXUser_AcquireRecLock(MXUserRecLock *lock)  // IN/OUT:
 void
 MXUser_ReleaseRecLock(MXUserRecLock *lock)  // IN/OUT:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
    ASSERT(Atomic_Read(&lock->refCount) > 0);
 
@@ -639,7 +639,7 @@ MXUser_TryAcquireRecLock(MXUserRecLock *lock)  // IN/OUT:
 {
    Bool success;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
    ASSERT(Atomic_Read(&lock->refCount) > 0);
 
@@ -697,7 +697,7 @@ MXUser_IsCurThreadHoldingRecLock(MXUserRecLock *lock)  // IN:
 {
    Bool result;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
    ASSERT(Atomic_Read(&lock->refCount) > 0);
 
@@ -738,7 +738,7 @@ MXUser_CreateSingletonRecLockInt(Atomic_Ptr *lockStorage,  // IN/OUT:
 {
    MXUserRecLock *lock;
 
-   ASSERT(lockStorage);
+   ASSERT(lockStorage != NULL);
 
    lock = Atomic_ReadPtr(lockStorage);
 
@@ -780,7 +780,7 @@ MXUser_CreateCondVarRecLock(MXUserRecLock *lock)
 {
    MXUserCondVar *condVar;
 
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
    ASSERT(lock->vmmLock == NULL);  // only unbound locks
 
@@ -813,7 +813,7 @@ void
 MXUser_WaitCondVarRecLock(MXUserRecLock *lock,     // IN:
                           MXUserCondVar *condVar)  // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
    ASSERT(lock->vmmLock == NULL);  // only unbound locks
 
@@ -846,7 +846,7 @@ MXUser_TimedWaitCondVarRecLock(MXUserRecLock *lock,     // IN:
                                MXUserCondVar *condVar,  // IN:
                                uint32 waitTimeMsec)     // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
    ASSERT(lock->vmmLock == NULL);  // only unbound locks
 
@@ -874,7 +874,7 @@ MXUser_TimedWaitCondVarRecLock(MXUserRecLock *lock,     // IN:
 void
 MXUser_DumpRecLock(MXUserRecLock *lock)  // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
 
    MXUserDumpRecLock(&lock->header);
@@ -900,7 +900,7 @@ MXUser_DumpRecLock(MXUserRecLock *lock)  // IN:
 struct MX_MutexRec *
 MXUser_GetRecLockVmm(MXUserRecLock *lock)  // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
 
    return lock->vmmLock;
@@ -926,7 +926,7 @@ MXUser_GetRecLockVmm(MXUserRecLock *lock)  // IN:
 MX_Rank
 MXUser_GetRecLockRank(MXUserRecLock *lock)  // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
 
    return lock->header.rank;
@@ -958,7 +958,7 @@ MXUser_BindMXMutexRec(struct MX_MutexRec *mutex,  // IN:
    char *name;
    MXUserRecLock *lock;
 
-   ASSERT(mutex);
+   ASSERT(mutex != NULL);
 
    /*
     * Cannot perform a binding unless MX_Init has been called. As a side
@@ -1026,7 +1026,7 @@ MXUser_BindMXMutexRec(struct MX_MutexRec *mutex,  // IN:
 void
 MXUser_IncRefRecLock(MXUserRecLock *lock)  // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
    ASSERT(Atomic_Read(&lock->refCount) > 0);
 
@@ -1054,7 +1054,7 @@ MXUser_IncRefRecLock(MXUserRecLock *lock)  // IN:
 void
 MXUser_DecRefRecLock(MXUserRecLock *lock)  // IN:
 {
-   ASSERT(lock);
+   ASSERT(lock != NULL);
    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
 
    MXUserCondDestroyRecLock(lock);

diff --git a/open-vm-tools/lib/lock/ulSema.c b/open-vm-tools/lib/lock/ulSema.c
index ea5d6e387f988cdd42052b8753b9caf5226163c1..904e05b4508dd92da829d2e45746494dbf6d6e77 100644 (file)
--- a/open-vm-tools/lib/lock/ulSema.c
+++ b/open-vm-tools/lib/lock/ulSema.c
@@ -578,7 +578,7 @@ MXUser_DownSemaphore(MXUserSemaphore *sema)  // IN/OUT:
 {
    int err;
 
-   ASSERT(sema);
+   ASSERT(sema != NULL);
    MXUserValidateHeader(&sema->header, MXUSER_TYPE_SEMA);
 
    Atomic_Inc(&sema->activeUserCount);
@@ -658,7 +658,7 @@ MXUser_TimedDownSemaphore(MXUserSemaphore *sema,  // IN/OUT:
    int err;
    Bool downOccurred = FALSE;
 
-   ASSERT(sema);
+   ASSERT(sema != NULL);
    MXUserValidateHeader(&sema->header, MXUSER_TYPE_SEMA);
 
    Atomic_Inc(&sema->activeUserCount);
@@ -747,7 +747,7 @@ MXUser_TryDownSemaphore(MXUserSemaphore *sema)  // IN/OUT:
    int err;
    Bool downOccurred = FALSE;
 
-   ASSERT(sema);
+   ASSERT(sema != NULL);
    MXUserValidateHeader(&sema->header, MXUSER_TYPE_SEMA);
 
    Atomic_Inc(&sema->activeUserCount);
@@ -798,7 +798,7 @@ MXUser_UpSemaphore(MXUserSemaphore *sema)  // IN/OUT:
 {
    int err;
 
-   ASSERT(sema);
+   ASSERT(sema != NULL);
    MXUserValidateHeader(&sema->header, MXUSER_TYPE_SEMA);
 
    /*
@@ -846,7 +846,7 @@ MXUser_CreateSingletonSemaphore(Atomic_Ptr *semaStorage,  // IN/OUT:
 {
    MXUserSemaphore *sema;
 
-   ASSERT(semaStorage);
+   ASSERT(semaStorage != NULL);
 
    sema = Atomic_ReadPtr(semaStorage);