Replace NULL -> nullptr in *.cpp (#2209)

Co-authored-by: Abdoulbari Zaher <[email protected]>
AntaresSimulatorTeam · Jul 1, 2024 · c86b1dd · c86b1dd
1 parent 9c725f5
commit c86b1dd
Show file tree

Hide file tree

Showing 84 changed files with 189 additions and 187 deletions.
diff --git a/src/analyzer/atsp/cache.cpp b/src/analyzer/atsp/cache.cpp
@@ -37,7 +37,7 @@ void ATSP::cacheCreate()
 void ATSP::cacheDestroy()
 {
     delete[] pCacheMatrix;
-    pCacheMatrix = NULL;
+    pCacheMatrix = nullptr;
 }
 
 void ATSP::cacheClear()

diff --git a/src/analyzer/atsp/load.cpp b/src/analyzer/atsp/load.cpp
@@ -54,12 +54,12 @@ bool ATSP::loadFromINIFile(const String& filename)
         CString<50, false> key;
         CString<50, false> value;
 
-        for (section = ini.firstSection; section != NULL; section = section->next)
+        for (section = ini.firstSection; section; section = section->next)
         {
             if (section->name == ".general")
             {
                 IniFile::Property* p = section->firstProperty;
-                for (; p != NULL; p = p->next)
+                for (; p ; p = p->next)
                 {
                     key = p->key;
                     key.toLower();
@@ -180,7 +180,7 @@ bool ATSP::loadFromINIFile(const String& filename)
                 info->distribution = Data::XCast::dtBeta;
 
                 IniFile::Property* p = section->firstProperty;
-                for (; p != NULL; p = p->next)
+                for (; p; p = p->next)
                 {
                     key = p->key;
                     key.toLower();

diff --git a/src/ext/yuni/src/yuni/core/any/any.cpp b/src/ext/yuni/src/yuni/core/any/any.cpp
@@ -16,7 +16,7 @@ namespace Yuni
 Any::Any()
 {
     pTable = Private::Any::Table<Private::Any::Empty>::Get();
-    pObject = NULL;
+    pObject = nullptr;
 }
 
 Any::Any(const Any& rhs)
@@ -59,7 +59,7 @@ void Any::reset()
     {
         pTable->staticDelete(&pObject);
         pTable = Private::Any::Table<Private::Any::Empty>::Get();
-        pObject = NULL;
+        pObject = nullptr;
     }
 }
 

diff --git a/src/ext/yuni/src/yuni/core/charset/charset.cpp b/src/ext/yuni/src/yuni/core/charset/charset.cpp
@@ -61,7 +61,7 @@ void Converter::reset()
 {
     if (!valid())
         return;
-    iconv((iconv_t)pContext, NULL, NULL, NULL, NULL);
+    iconv((iconv_t)pContext, nullptr, nullptr, nullptr, nullptr);
 }
 
 const char* Converter::Name(Charset::Type type)

diff --git a/src/ext/yuni/src/yuni/core/dynamiclibrary/file.cpp b/src/ext/yuni/src/yuni/core/dynamiclibrary/file.cpp
@@ -215,7 +215,7 @@ bool File::loadFromRawFilename(const AnyString& filename, File::Relocation r, Fi
 bool File::hasSymbol(const AnyString& name) const
 {
     return NullHandle != pHandle
-           and NULL != reinterpret_cast<Symbol::Handle>(YUNI_DYNLIB_DLSYM(pHandle, name.c_str()));
+           && reinterpret_cast<Symbol::Handle>(YUNI_DYNLIB_DLSYM(pHandle, name.c_str()));
 }
 
 Symbol File::resolve(const AnyString& name) const

diff --git a/src/ext/yuni/src/yuni/core/getopt/parser.cpp b/src/ext/yuni/src/yuni/core/getopt/parser.cpp
@@ -118,7 +118,7 @@ inline Context::Context(Parser& parser) : pParser(parser), pTokenIndex(1), pPara
 
 bool Context::findNextParameter(IOption* option, int argc, char* argv[])
 {
-    assert(option != NULL);
+    assert(option);
 
     if (not option->requireAdditionalParameter())
     {
@@ -343,7 +343,7 @@ GetOpt::ReturnCode Parser::operator()(int argc, char* argv[])
 
 void Parser::helpUsage(const char* argv0)
 {
-    assert(argv0 != NULL); // just in case
+    assert(argv0); // just in case// OK
 
     std::cout.write("Usage: ", 7);
     std::cout << ExtractFilenameOnly(argv0);

diff --git a/src/ext/yuni/src/yuni/core/system/environment.cpp b/src/ext/yuni/src/yuni/core/system/environment.cpp
@@ -45,7 +45,7 @@ inline bool ReadImpl(const AnyString& name, StringT& out, bool emptyBefore)
                 if (size != 0)
                 {
                     int sizeRequired
-                      = WideCharToMultiByte(CP_UTF8, 0, buffer, (int)size - 1, NULL, 0, NULL, NULL);
+                      = WideCharToMultiByte(CP_UTF8, 0, buffer, (int)size - 1, nullptr, 0, nullptr, nullptr);
                     if (sizeRequired > 0)
                     {
                         out.reserve(out.size() + sizeRequired);
@@ -55,8 +55,8 @@ inline bool ReadImpl(const AnyString& name, StringT& out, bool emptyBefore)
                                                                (int)size - 1,
                                                                out.data() + out.size(),
                                                                size,
-                                                               NULL,
-                                                               NULL);
+                                                               nullptr,
+                                                               nullptr);
                         ::free(buffer);
                         out.resize(out.size() + (uint)sizeRequired);
                         return true;

diff --git a/src/ext/yuni/src/yuni/core/system/gettimeofday.cpp b/src/ext/yuni/src/yuni/core/system/gettimeofday.cpp
@@ -19,15 +19,15 @@ namespace Yuni
 {
 int gettimeofday(struct timeval* tv, struct timezone* tz)
 {
-    if (NULL != tv)
+    if (tv)
     {
         struct _timeb timebuffer;
         _ftime64_s(&timebuffer);
         tv->tv_sec = (int64_t)(timebuffer.time);
         tv->tv_usec = (int64_t)(timebuffer.millitm * 1000);
     }
 
-    if (NULL != tz)
+    if (tz)
     {
         static int tzflag = 0;
         if (!tzflag)

diff --git a/src/ext/yuni/src/yuni/core/system/memory.cpp b/src/ext/yuni/src/yuni/core/system/memory.cpp
@@ -268,7 +268,7 @@ uint64_t Total()
     int mib[2] = {CTL_HW, HW_MEMSIZE};
     uint64_t memory;
     size_t len = sizeof(uint64_t);
-    return (!sysctl(mib, 2, &memory, &len, NULL, 0)) ? memory : (uint64_t)defaultTotal;
+    return (!sysctl(mib, 2, &memory, &len, nullptr, 0)) ? memory : (uint64_t)defaultTotal;
 }
 
 uint64_t Available()
@@ -298,7 +298,7 @@ bool Usage::update()
     int mib[2] = {CTL_HW, HW_MEMSIZE};
     size_t len = sizeof(uint64_t);
     size_t sttotal;
-    if (sysctl(mib, 2, &sttotal, &len, NULL, 0))
+    if (sysctl(mib, 2, &sttotal, &len, nullptr, 0))
     {
         total = (uint64_t)defaultTotal;
         return false;

diff --git a/src/ext/yuni/src/yuni/core/system/username.cpp b/src/ext/yuni/src/yuni/core/system/username.cpp
@@ -37,12 +37,12 @@ uint WindowsUsername(char* cstring, uint size)
             // The variable `unwsize` contains the final zero
             --unwsize;
             // Getting the size of the buffer into UTF8
-            int sizeRequired = WideCharToMultiByte(CP_UTF8, 0, unw, unwsize, NULL, 0, NULL, NULL);
+            int sizeRequired = WideCharToMultiByte(CP_UTF8, 0, unw, unwsize, nullptr, 0, nullptr, nullptr);
             if (sizeRequired > 0)
             {
                 if (static_cast<uint>(sizeRequired) > size)
                     sizeRequired = size;
-                WideCharToMultiByte(CP_UTF8, 0, unw, unwsize, cstring, sizeRequired, NULL, NULL);
+                WideCharToMultiByte(CP_UTF8, 0, unw, unwsize, cstring, sizeRequired, nullptr, nullptr);
                 return static_cast<uint>(sizeRequired);
             }
         }

diff --git a/src/ext/yuni/src/yuni/datetime/timestamp.cpp b/src/ext/yuni/src/yuni/datetime/timestamp.cpp
@@ -97,9 +97,9 @@ char* FormatTimestampToString(const AnyString& format, int64_t timestamp)
     if (timestamp <= 0)
     {
 #ifdef YUNI_OS_MSVC
-        timestamp = (int64_t)::_time64(NULL);
+        timestamp = (int64_t)::_time64(nullptr);
 #else
-        timestamp = (int64_t)::time(NULL);
+        timestamp = (int64_t)::time(nullptr);
 #endif
     }
 

diff --git a/src/ext/yuni/src/yuni/io/directory/info/platform.cpp b/src/ext/yuni/src/yuni/io/directory/info/platform.cpp
@@ -189,12 +189,12 @@ class DirInfo final : private Yuni::NonCopyable<DirInfo>
             }
 
             const int sizeRequired
-              = WideCharToMultiByte(CP_UTF8, 0, data.name, -1, NULL, 0, NULL, NULL);
+              = WideCharToMultiByte(CP_UTF8, 0, data.name, -1, nullptr, 0, nullptr, nullptr);
             if (sizeRequired <= 0)
                 continue;
             name.reserve((uint)sizeRequired);
             WideCharToMultiByte(
-              CP_UTF8, 0, data.name, -1, (char*)name.data(), sizeRequired, NULL, NULL);
+              CP_UTF8, 0, data.name, -1, (char*)name.data(), sizeRequired, nullptr, nullptr);
             name.resize(((uint)sizeRequired) - 1);
 
             filename.clear();
@@ -341,12 +341,12 @@ IteratorData* IteratorDataCreate(const AnyString& folder, uint flags)
         data->push(folder);
         return data;
     }
-    return NULL;
+    return nullptr;
 }
 
 IteratorData* IteratorDataCopy(const IteratorData* data)
 {
-    return (data) ? (new IteratorData(*data)) : NULL;
+    return (data) ? (new IteratorData(*data)) : nullptr;
 }
 
 void IteratorDataFree(const IteratorData* data)
@@ -356,52 +356,52 @@ void IteratorDataFree(const IteratorData* data)
 
 IteratorData* IteratorDataNext(IteratorData* data)
 {
-    assert(data != NULL);
+    assert(data);
     if (data->next())
         return data;
     delete data;
-    return NULL;
+    return nullptr;
 }
 
 const String& IteratorDataFilename(const IteratorData* data)
 {
-    assert(data != NULL);
+    assert(data);
     return data->dirinfo.front().filename;
 }
 
 const String& IteratorDataParentName(const IteratorData* data)
 {
-    assert(data != NULL);
+    assert(data);
     return data->dirinfo.front().parent;
 }
 
 const String& IteratorDataName(const IteratorData* data)
 {
-    assert(data != NULL);
+    assert(data);
     return data->dirinfo.front().name;
 }
 
 uint64_t IteratorDataSize(const IteratorData* data)
 {
-    assert(data != NULL);
+    assert(data);
     return data->dirinfo.front().size;
 }
 
 int64_t IteratorDataModified(const IteratorData* data)
 {
-    assert(data != NULL);
+    assert(data);
     return data->dirinfo.front().modified;
 }
 
 bool IteratorDataIsFolder(const IteratorData* data)
 {
-    assert(data != NULL);
+    assert(data);
     return data->dirinfo.front().isFolder;
 }
 
 bool IteratorDataIsFile(const IteratorData* data)
 {
-    assert(data != NULL);
+    assert(data);
     return !data->dirinfo.front().isFolder;
 }
 

diff --git a/src/ext/yuni/src/yuni/io/directory/iterator/iterator.cpp b/src/ext/yuni/src/yuni/io/directory/iterator/iterator.cpp
@@ -148,7 +148,7 @@ Flow TraverseWindowsFolder(const String& filename,
                            bool files)
 {
     // Convertir the filename
-    assert(opts.wbuffer != NULL);
+    assert(opts.wbuffer);
     opts.wbuffer[0] = L'\\';
     opts.wbuffer[1] = L'\\';
     opts.wbuffer[2] = L'?';
@@ -199,12 +199,12 @@ Flow TraverseWindowsFolder(const String& filename,
         }
 
         const int sizeRequired
-          = WideCharToMultiByte(CP_UTF8, 0, data.cFileName, -1, NULL, 0, NULL, NULL);
+          = WideCharToMultiByte(CP_UTF8, 0, data.cFileName, -1, nullptr, 0, nullptr, nullptr);
         if (sizeRequired <= 0)
             continue;
         newName.reserve((uint)sizeRequired);
         WideCharToMultiByte(
-          CP_UTF8, 0, data.cFileName, -1, (char*)newName.data(), sizeRequired, NULL, NULL);
+          CP_UTF8, 0, data.cFileName, -1, (char*)newName.data(), sizeRequired, nullptr, nullptr);
         newName.resize(((uint)sizeRequired) - 1);
 
         newFilename.clear();

diff --git a/src/ext/yuni/src/yuni/io/directory/remove.cpp b/src/ext/yuni/src/yuni/io/directory/remove.cpp
@@ -73,7 +73,7 @@ static bool RmDirRecursiveInternal(const AnyString& path)
                     buffer.clear() << path << SEP << (const char*)ep->d_name;
                     ::unlink(buffer.c_str());
                 }
-            } while (NULL != (ep = ::readdir(dp)));
+            } while (nullptr != (ep = ::readdir(dp)));
         }
         (void)::closedir(dp);
     }

diff --git a/src/ext/yuni/src/yuni/io/file/file.cpp b/src/ext/yuni/src/yuni/io/file/file.cpp
@@ -71,7 +71,7 @@ bool Size(const AnyString& filename, uint64_t& value)
     }
 
     HANDLE hndl = CreateFileW(
-      wstr.c_str(), 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+      wstr.c_str(), 0, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
     if (hndl == INVALID_HANDLE_VALUE)
     {
         value = 0u;
@@ -158,7 +158,7 @@ bool GetLastWriteTime(HANDLE hFile)
         // Convert the last-write time to local time.
         if (!FileTimeToSystemTime(&ftWrite, &stUTC))
                 return false;
-        if (!SystemTimeToTzSpecificLocalTime(NULL, &stUTC, &stLocal))
+        if (!SystemTimeToTzSpecificLocalTime(nullptr, &stUTC, &stLocal))
                 return false;
 
         return true;

diff --git a/src/ext/yuni/src/yuni/io/file/stream.cpp b/src/ext/yuni/src/yuni/io/file/stream.cpp
@@ -121,7 +121,7 @@ bool Stream::open(const AnyString& filename, int mode)
     pFd = ::fopen(filename.c_str(), OpenMode::ToCString(mode));
 #endif
 
-    return (NULL != pFd);
+    return (pFd);
 }
 
 bool Stream::close()
@@ -130,7 +130,7 @@ bool Stream::close()
     {
         if (0 == ::fclose(pFd))
         {
-            pFd = NULL;
+            pFd = nullptr;
             return true;
         }
         return false;

diff --git a/src/ext/yuni/src/yuni/job/job.cpp b/src/ext/yuni/src/yuni/job/job.cpp
@@ -21,14 +21,14 @@ IJob::IJob() : pThread(nullptr)
 
 IJob::~IJob()
 {
-    assert(this != NULL and "IJob: Destructor: Oo `this' is null !?");
-    assert(pThread == NULL and "A job can not be attached to a thread when destroyed");
+    assert(this && "IJob: Destructor: Oo `this' is null !?");
+    assert(!pThread && "A job can not be attached to a thread when destroyed");
 }
 
 bool IJob::suspend(uint delay) const
 {
     // This method must only be called from a thread
-    assert(pThread and "Job: The pointer to the attached thread must not be NULL");
+    assert(pThread and "Job: The pointer to the attached thread must not be nullptr");
 
     // We can suspend the job only if it is running
     if (pState == stateRunning)

diff --git a/src/ext/yuni/src/yuni/job/queue/service.cpp b/src/ext/yuni/src/yuni/job/queue/service.cpp
@@ -37,14 +37,14 @@ static inline uint OptimalCPUCount()
     return count;
 }
 
-QueueService::QueueService() : pStatus(sStopped), pThreads(NULL)
+QueueService::QueueService() : pStatus(sStopped), pThreads(nullptr)
 {
     uint count = OptimalCPUCount();
     pMinimumThreadCount = count;
     pMaximumThreadCount = count;
 }
 
-QueueService::QueueService(bool autostart) : pStatus(sStopped), pThreads(NULL)
+QueueService::QueueService(bool autostart) : pStatus(sStopped), pThreads(nullptr)
 {
     uint count = OptimalCPUCount();
     pMinimumThreadCount = count;
@@ -172,7 +172,7 @@ void QueueService::stop(uint timeout)
             return;
 
         threads = (ThreadArray*)pThreads;
-        pThreads = NULL;
+        pThreads = nullptr;
         pStatus = sStopping;
     }