From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:19 +0000 (-0700)
Subject: lib/file: consistent ASSERT policy
X-Git-Tag: stable-10.2.0~395
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=751a92ec8f2781caa5e9da96ab11e5b28d9ae142;p=thirdparty%2Fopen-vm-tools.git

lib/file: consistent ASSERT policy

ASSERTs on pointers are against NULL
---

diff --git a/open-vm-tools/lib/file/fileIOPosix.c b/open-vm-tools/lib/file/fileIOPosix.c
index aa8904614..43031a56b 100644
--- a/open-vm-tools/lib/file/fileIOPosix.c
+++ b/open-vm-tools/lib/file/fileIOPosix.c
@@ -362,7 +362,7 @@ FileIO_OptionalSafeInitialize(void)
 void
 FileIO_Invalidate(FileIODescriptor *fd)  // OUT:
 {
-   ASSERT(fd);
+   ASSERT(fd != NULL);
 
    (memset)(fd, 0, sizeof *fd);
    fd->posix = -1;
@@ -388,7 +388,7 @@ FileIO_Invalidate(FileIODescriptor *fd)  // OUT:
 Bool
 FileIO_IsValid(const FileIODescriptor *fd)  // IN:
 {
-   ASSERT(fd);
+   ASSERT(fd != NULL);
 
    return fd->posix != -1;
 }
@@ -476,7 +476,7 @@ Bool
 FileIO_GetVolumeSectorSize(const char *pathName,  // IN:
                            uint32 *sectorSize)    // OUT:
 {
-   ASSERT(sectorSize);
+   ASSERT(sectorSize != NULL);
 
    *sectorSize = 512;
 
@@ -844,7 +844,7 @@ FileIOCreateRetry(FileIODescriptor *file,   // OUT:
    int error;
    FileIOResult ret;
 
-   ASSERT(file);
+   ASSERT(file != NULL);
 
    if (pathName == NULL) {
       errno = EFAULT;
@@ -1218,7 +1218,7 @@ FileIO_Seek(const FileIODescriptor *file,  // IN:
             int64 distance,                // IN:
             FileIOSeekOrigin origin)       // IN:
 {
-   ASSERT(file);
+   ASSERT(file != NULL);
 
 #if defined(__ANDROID__)
    /*
@@ -1272,7 +1272,7 @@ FileIO_Write(FileIODescriptor *fd,  // IN:
    size_t initial_requested;
    FileIOResult fret = FILEIO_SUCCESS;
 
-   ASSERT(fd);
+   ASSERT(fd != NULL);
 
    VERIFY(requested < 0x80000000);
 
@@ -1335,7 +1335,7 @@ FileIO_Read(FileIODescriptor *fd,  // IN:
    size_t initial_requested;
    FileIOResult fret = FILEIO_SUCCESS;
 
-   ASSERT(fd);
+   ASSERT(fd != NULL);
 
    VERIFY(requested < 0x80000000);
 
@@ -1389,7 +1389,7 @@ Bool
 FileIO_Truncate(FileIODescriptor *file,  // IN:
                 uint64 newLength)        // IN:
 {
-   ASSERT(file);
+   ASSERT(file != NULL);
 
    return ftruncate(file->posix, newLength) == 0;
 }
@@ -1418,7 +1418,7 @@ FileIO_Close(FileIODescriptor *file)  // IN:
 {
    int err;
 
-   ASSERT(file);
+   ASSERT(file != NULL);
 
    err = (close(file->posix) == -1) ? errno : 0;
 
@@ -1455,7 +1455,7 @@ FileIO_Close(FileIODescriptor *file)  // IN:
 FileIOResult
 FileIO_Sync(const FileIODescriptor *file)  // IN:
 {
-   ASSERT(file);
+   ASSERT(file != NULL);
 
    return (fsync(file->posix) == -1) ? FILEIO_ERROR : FILEIO_SUCCESS;
 }
@@ -1496,8 +1496,8 @@ FileIOCoalesce(
 {
    uint8 *cBuf;
 
-   ASSERT(inVec);
-   ASSERT(outVec);
+   ASSERT(inVec != NULL);
+   ASSERT(outVec != NULL);
 
    FileIO_OptionalSafeInitialize();
 
@@ -1569,8 +1569,8 @@ FileIODecoalesce(
         Bool isWrite,                // IN: decoalesce for writing (or reading)
         int flags)                   // IN: fileIO open flags
 {
-   ASSERT(coVec);
-   ASSERT(origVec);
+   ASSERT(coVec != NULL);
+   ASSERT(origVec != NULL);
 
    ASSERT(actualSize <= coVec->iov_len);
    ASSERT_NOT_TESTED(actualSize == coVec->iov_len);
@@ -1625,7 +1625,7 @@ FileIO_Readv(FileIODescriptor *fd,  // IN:
    Bool didCoalesce;
    int numVec;
 
-   ASSERT(fd);
+   ASSERT(fd != NULL);
 
    didCoalesce = FileIOCoalesce(v, numEntries, totalSize, FALSE,
                                 FALSE, fd->flags, &coV);
@@ -1738,7 +1738,7 @@ FileIO_Writev(FileIODescriptor *fd,  // IN:
    Bool didCoalesce;
    int numVec;
 
-   ASSERT(fd);
+   ASSERT(fd != NULL);
 
    didCoalesce = FileIOCoalesce(v, numEntries, totalSize, TRUE,
                                 FALSE, fd->flags, &coV);
@@ -2283,8 +2283,8 @@ FileIO_Preadv(FileIODescriptor *fd,        // IN: File descriptor
 {
    FileIOResult fret;
 
-   ASSERT(fd);
-   ASSERT(entries);
+   ASSERT(fd != NULL);
+   ASSERT(entries != NULL);
    ASSERT(!(fd->flags & FILEIO_ASYNCHRONOUS));
    VERIFY(totalSize < 0x80000000);
 
@@ -2329,8 +2329,8 @@ FileIO_Pwritev(FileIODescriptor *fd,        // IN: File descriptor
 {
    FileIOResult fret;
 
-   ASSERT(fd);
-   ASSERT(entries);
+   ASSERT(fd != NULL);
+   ASSERT(entries != NULL);
    ASSERT(!(fd->flags & FILEIO_ASYNCHRONOUS));
    VERIFY(totalSize < 0x80000000);
 
@@ -2371,7 +2371,7 @@ FileIO_GetAllocSize(const FileIODescriptor *fd,  // IN:
 {
    struct stat statBuf;
 
-   ASSERT(fd);
+   ASSERT(fd != NULL);
 
    if (fstat(fd->posix, &statBuf) == -1) {
       return FileIOErrno2Result(errno);
@@ -2570,7 +2570,7 @@ FileIO_Access(const char *pathName,  // IN: Path name. May be NULL.
 uint32
 FileIO_GetFlags(FileIODescriptor *fd)  // IN:
 {
-   ASSERT(fd);
+   ASSERT(fd != NULL);
    ASSERT(FileIO_IsValid(fd));
 
    return fd->flags;
diff --git a/open-vm-tools/lib/file/fileLockPosix.c b/open-vm-tools/lib/file/fileLockPosix.c
index 2e62133f5..cd593aa99 100644
--- a/open-vm-tools/lib/file/fileLockPosix.c
+++ b/open-vm-tools/lib/file/fileLockPosix.c
@@ -100,7 +100,7 @@ IsLinkingAvailable(const char *fileName)  // IN:
    struct statfs buf;
    int status;
 
-   ASSERT(fileName);
+   ASSERT(fileName != NULL);
 
    /*
     * Don't use linking on ESX/VMFS... the overheads are expensive and this
@@ -192,7 +192,7 @@ RemoveStaleLockFile(const char *lockFileName)  // IN:
    int ret;
    int saveErrno;
 
-   ASSERT(lockFileName);
+   ASSERT(lockFileName != NULL);
 
    /* stale lock */
    Log(LGPFX" Found a previous instance of lock file '%s'. "
@@ -243,9 +243,9 @@ GetLockFileValues(const char *lockFileName,  // IN:
    uid_t uid;
    int status;
 
-   ASSERT(lockFileName);
-   ASSERT(pid);
-   ASSERT(hostID);
+   ASSERT(lockFileName != NULL);
+   ASSERT(pid != NULL);
+   ASSERT(hostID != NULL);
 
    uid = Id_BeginSuperUser();
    lockFile = Posix_Fopen(lockFileName, "r");
@@ -460,7 +460,7 @@ FileLock_LockDevice(const char *deviceName)  // IN:
 
    int  status = -1;
 
-   ASSERT(deviceName);
+   ASSERT(deviceName != NULL);
 
    lockFileName = Str_SafeAsprintf(NULL, "%s/LCK..%s", DEVICE_LOCK_DIR,
                                    deviceName);
@@ -548,7 +548,7 @@ FileLock_UnlockDevice(const char *deviceName)  // IN:
    int saveErrno;
    char *path;
 
-   ASSERT(deviceName);
+   ASSERT(deviceName != NULL);
 
    path = Str_SafeAsprintf(NULL, "%s/LCK..%s", DEVICE_LOCK_DIR, deviceName);
 
@@ -627,8 +627,8 @@ FileReadSlashProc(const char *procPath,  // IN:
    char *p;
    size_t len;
 
-   ASSERT(procPath);
-   ASSERT(buffer);
+   ASSERT(procPath != NULL);
+   ASSERT(buffer != NULL);
    ASSERT(bufferSize > 0);
 
    fd = Posix_Open(procPath, O_RDONLY, 0);
@@ -804,7 +804,7 @@ FileLockProcessCreationTime(pid_t pid,                 // IN:
    struct kinfo_proc info;
    int mib[4];
 
-   ASSERT(procCreationTime);
+   ASSERT(procCreationTime != NULL);
 
    /* Request information about the specified process */
    mib[0] = CTL_KERN;
@@ -926,7 +926,7 @@ FileLockGetExecutionID(void)
 {
    char *descriptor = FileLockProcessDescriptor(getpid());
 
-   ASSERT(descriptor);  // Must be able to describe ourselves!
+   ASSERT(descriptor != NULL);  // Must be able to describe ourselves!
 
    return descriptor;
 }
@@ -955,9 +955,9 @@ FileLockParseProcessDescriptor(const char *procDescriptor,  // IN:
                                pid_t *pid,                  // OUT:
                                uint64 *procCreationTime)    // OUT:
 {
-   ASSERT(procDescriptor);
-   ASSERT(pid);
-   ASSERT(procCreationTime);
+   ASSERT(procDescriptor != NULL);
+   ASSERT(pid != NULL);
+   ASSERT(procCreationTime != NULL);
 
    if (sscanf(procDescriptor, "%d-%"FMT64"u", pid, procCreationTime) != 2) {
       if (sscanf(procDescriptor, "%d", pid) == 1) {
@@ -1119,8 +1119,8 @@ FileLock_Lock(const char *filePath,          // IN:
    char *normalizedPath;
    FileLockToken *tokenPtr;
 
-   ASSERT(filePath);
-   ASSERT(err);
+   ASSERT(filePath != NULL);
+   ASSERT(err != NULL);
 
    normalizedPath = FileLockNormalizePath(filePath);
 
@@ -1179,7 +1179,7 @@ FileLock_IsLocked(const char *filePath,  // IN:
    Bool isLocked;
    char *normalizedPath;
 
-   ASSERT(filePath);
+   ASSERT(filePath != NULL);
 
    normalizedPath = FileLockNormalizePath(filePath);
 
@@ -1229,7 +1229,7 @@ FileLock_Unlock(const FileLockToken *lockToken,  // IN:
 {
    int res;
 
-   ASSERT(lockToken);
+   ASSERT(lockToken != NULL);
 
    res = FileUnlockIntrinsic((FileLockToken *) lockToken);
 
diff --git a/open-vm-tools/lib/file/fileLockPrimitive.c b/open-vm-tools/lib/file/fileLockPrimitive.c
index 73045a3d5..2987426dc 100644
--- a/open-vm-tools/lib/file/fileLockPrimitive.c
+++ b/open-vm-tools/lib/file/fileLockPrimitive.c
@@ -181,8 +181,8 @@ FileLockRemoveLockingFile(const char *lockDir,   // IN:
    int err;
    char *path;
 
-   ASSERT(lockDir);
-   ASSERT(fileName);
+   ASSERT(lockDir != NULL);
+   ASSERT(fileName != NULL);
 
    path = Unicode_Join(lockDir, DIRSEPS, fileName, NULL);
 
@@ -315,8 +315,8 @@ FileLockMemberValues(const char *lockDir,       // IN:
                            }
                         };
 
-   ASSERT(lockDir);
-   ASSERT(fileName);
+   ASSERT(lockDir != NULL);
+   ASSERT(fileName != NULL);
 
    path = Unicode_Join(lockDir, DIRSEPS, fileName, NULL);
 
@@ -537,7 +537,7 @@ FileLockValidName(const char *fileName)  // IN:
 {
    uint32 i;
 
-   ASSERT(fileName);
+   ASSERT(fileName != NULL);
 
    /* The fileName must start with the ASCII character, 'M', 'D' or 'E' */
    if (Unicode_FindSubstrInRange("MDE", 0, -1, fileName, 0,
@@ -581,7 +581,7 @@ FileLockActivateList(const char *dirName,   // IN:
 {
    ActiveLock   *ptr;
 
-   ASSERT(dirName);
+   ASSERT(dirName != NULL);
 
    ASSERT(*dirName == 'D');
 
@@ -693,7 +693,7 @@ FileLockScanDirectory(const char *lockDir,      // IN:
    char *myExecutionID = NULL;
    char *locationChecksum = NULL;
 
-   ASSERT(lockDir);
+   ASSERT(lockDir != NULL);
 
    numEntries = FileListDirectoryRobust(lockDir, &fileList);
 
@@ -875,7 +875,7 @@ FileLockScanner(const char *lockDir,     // IN:
    int        err;
    ActiveLock *ptr;
 
-   ASSERT(lockDir);
+   ASSERT(lockDir != NULL);
 
    myValues->lockList = NULL;
 
@@ -1088,8 +1088,8 @@ FileLockWaitForPossession(const char *lockDir,       // IN:
 {
    int err = 0;
 
-   ASSERT(lockDir);
-   ASSERT(fileName);
+   ASSERT(lockDir != NULL);
+   ASSERT(fileName != NULL);
 
    /* "Win" or wait? */
    if (((memberValues->lamportNumber < myValues->lamportNumber) ||
@@ -1179,8 +1179,8 @@ FileLockNumberScan(const char *lockDir,       // IN:
                    LockValues *memberValues,  // IN:
                    LockValues *myValues)      // IN/OUT:
 {
-   ASSERT(lockDir);
-   ASSERT(fileName);
+   ASSERT(lockDir != NULL);
+   ASSERT(fileName != NULL);
 
    if (memberValues->lamportNumber > myValues->lamportNumber) {
       myValues->lamportNumber = memberValues->lamportNumber;
@@ -1218,7 +1218,7 @@ FileLockMakeDirectory(const char *pathName)  // IN:
    save = umask(0);
 #endif
 
-   ASSERT(pathName);
+   ASSERT(pathName != NULL);
 
    err = FileCreateDirectoryRobust(pathName, 0777);
 
@@ -1265,7 +1265,7 @@ FileLockCreateEntryDirectory(const char *lockDir,    // IN:
    int err = 0;
    uint32 randomNumber = 0;
 
-   ASSERT(lockDir);
+   ASSERT(lockDir != NULL);
 
    *entryDirectory = NULL;
    *entryFilePath = NULL;
@@ -1439,8 +1439,8 @@ FileLockCreateMemberFile(FileIODescriptor *desc,       // IN:
    int err = 0;
    char buffer[FILELOCK_DATA_SIZE] = { 0 };
 
-   ASSERT(entryFilePath);
-   ASSERT(memberFilePath);
+   ASSERT(entryFilePath != NULL);
+   ASSERT(memberFilePath != NULL);
 
    /*
     * Populate the buffer with appropriate data
@@ -1648,8 +1648,8 @@ FileLockIntrinsicPortable(const char *pathName,   // IN:
    char *memberFilePath = NULL;
    char *entryDirectory = NULL;
 
-   ASSERT(pathName);
-   ASSERT(err);
+   ASSERT(pathName != NULL);
+   ASSERT(err != NULL);
 
    /*
     * Attempt to create the locking and entry directories; obtain the
@@ -2018,7 +2018,7 @@ FileLockIsLocked(const char *pathName,  // IN:
    Bool isLocked;
    char *lockBase;
 
-   ASSERT(pathName);
+   ASSERT(pathName != NULL);
 
    lockBase = Unicode_Append(pathName, FILELOCK_SUFFIX);