Convert NULL to nullptr in pointer comparisons

Author: bobtista

Core/GameEngine/Include/Common/AsciiString.h

@@ -420,7 +420,7 @@ inline int AsciiString::getByteCount() const
 inline Bool AsciiString::isEmpty() const
 {
 	validate();
-	return m_data == NULL || peek()[0] == 0;
+	return m_data == nullptr || peek()[0] == 0;
 }
 
 // -----------------------------------------------------

Core/GameEngine/Include/Common/UnicodeString.h

@@ -394,7 +394,7 @@ inline int UnicodeString::getByteCount() const
 inline Bool UnicodeString::isEmpty() const
 {
 	validate();
-	return m_data == NULL || peek()[0] == 0;
+	return m_data == nullptr || peek()[0] == 0;
 }
 
 // -----------------------------------------------------

Core/GameEngine/Source/Common/Audio/simpleplayer.cpp

@@ -39,12 +39,12 @@ CSimplePlayer::CSimplePlayer( HRESULT* phr )
 	*phr = S_OK;
 
     m_hOpenEvent = CreateEvent( nullptr, FALSE, FALSE, SIMPLE_PLAYER_OPEN_EVENT );
-	if ( NULL == m_hOpenEvent )
+	if ( nullptr == m_hOpenEvent )
 	{
 		*phr = E_OUTOFMEMORY;
 	}
     m_hCloseEvent = CreateEvent( nullptr, FALSE, FALSE, SIMPLE_PLAYER_CLOSE_EVENT );
-	if ( NULL == m_hCloseEvent )
+	if ( nullptr == m_hCloseEvent )
 	{
 		*phr = E_OUTOFMEMORY;
 	}
@@ -165,7 +165,7 @@ HRESULT STDMETHODCALLTYPE CSimplePlayer::OnSample(
 
     LPWAVEHDR pwh = (LPWAVEHDR) new BYTE[ sizeof( WAVEHDR ) + cbData ];
 
-    if( NULL == pwh )
+    if( nullptr == pwh )
     {
         DEBUG_LOG(( "OnSample OUT OF MEMORY! "));
 
@@ -234,7 +234,7 @@ HRESULT CSimplePlayer::Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hComple
         //
         LPWSTR pszCheck = _wfullpath( wszFullUrl, pszUrl, MAX_PATH );
 
-        if( NULL == pszCheck )
+        if( nullptr == pszCheck )
         {
            DEBUG_LOG(( "internal error %lu" , GetLastError() ));
            return E_UNEXPECTED ;
@@ -250,7 +250,7 @@ HRESULT CSimplePlayer::Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hComple
 
     m_pszUrl = new WCHAR[ wcslen( pszUrl ) + 1 ];
 
-    if( NULL == m_pszUrl )
+    if( nullptr == m_pszUrl )
     {
         DEBUG_LOG(( "insufficient Memory"  )) ;
         return( E_OUTOFMEMORY );
@@ -342,7 +342,7 @@ HRESULT CSimplePlayer::Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hComple
         pwszName = new WCHAR[ cchNamelen ];
         pValue = new BYTE[ cbLength ];
 
-        if( NULL == pwszName || NULL == pValue )
+        if( nullptr == pwszName || nullptr == pValue )
         {
             hr = E_OUTOFMEMORY;
             break;
@@ -625,7 +625,7 @@ HRESULT CSimplePlayer::Close()
 {
     HRESULT hr = S_OK;
 
-    if( NULL != m_pReader )
+    if( nullptr != m_pReader )
     {
         hr = m_pReader->Close();
 
@@ -677,7 +677,7 @@ void CALLBACK CSimplePlayer::WaveProc(
 HRESULT CSimplePlayer::AddWaveHeader( LPWAVEHDR pwh )
 {
     WAVEHDR_LIST *tmp = new WAVEHDR_LIST;
-    if( NULL == tmp )
+    if( nullptr == tmp )
     {
         return( E_OUTOFMEMORY );
     }
@@ -696,7 +696,7 @@ void CSimplePlayer::RemoveWaveHeaders( )
     WAVEHDR_LIST *tmp;
 
     EnterCriticalSection( &m_CriSec );
-    while( NULL != m_whdrHead )
+    while( nullptr != m_whdrHead )
     {
         tmp = m_whdrHead->next;
         DEBUG_ASSERTCRASH( m_whdrHead->pwh->dwFlags & WHDR_DONE, ("RemoveWaveHeaders!") );

Core/GameEngine/Source/Common/Audio/urllaunch.cpp

@@ -26,7 +26,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL )
 {
-    if( ( NULL == pszInURL ) || ( NULL == ppszOutURL ) )
+    if( ( nullptr == pszInURL ) || ( nullptr == ppszOutURL ) )
     {
         return( E_INVALIDARG );
     }
@@ -46,7 +46,7 @@ HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL )
     {
         LPWSTR pchToEscape = wcspbrk( pszTemp, L" #$%&\\+,;=@[]^{}" );
 
-        if( NULL == pchToEscape )
+        if( nullptr == pchToEscape )
         {
             break;
         }
@@ -68,7 +68,7 @@ HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL )
 
     *ppszOutURL = new WCHAR[ cchNeeded ];
 
-    if( NULL == *ppszOutURL )
+    if( nullptr == *ppszOutURL )
     {
         return( E_OUTOFMEMORY );
     }
@@ -90,7 +90,7 @@ HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL )
     {
         LPWSTR pchToEscape = wcspbrk( pszTemp, L" #$%&\\+,;=@[]^{}" );
 
-        if( NULL == pchToEscape )
+        if( nullptr == pchToEscape )
         {
             //
             // Copy the rest of the input string and get out
@@ -187,7 +187,7 @@ HRESULT GetShellOpenCommand( LPTSTR ptszShellOpenCommand, DWORD cbShellOpenComma
     //
     if( !fFoundExtensionCommand )
     {
-        if( NULL != hKey )
+        if( nullptr != hKey )
         {
             RegCloseKey( hKey );
         }
@@ -211,12 +211,12 @@ HRESULT GetShellOpenCommand( LPTSTR ptszShellOpenCommand, DWORD cbShellOpenComma
         while( FALSE );
     }
 
-    if( NULL != hKey )
+    if( nullptr != hKey )
     {
         RegCloseKey( hKey );
     }
 
-    if( NULL != hFileKey )
+    if( nullptr != hFileKey )
     {
         RegCloseKey( hFileKey );
     }
@@ -249,12 +249,12 @@ HRESULT LaunchURL( LPCWSTR pszURL )
 
     LPTSTR pszParam = _tcsstr( szShellOpenCommand, _T( "\"%1\"" ) );
 
-    if( NULL == pszParam )
+    if( nullptr == pszParam )
     {
         pszParam = _tcsstr( szShellOpenCommand, _T( "\"%*\"" ) );
     }
 
-    if( NULL != pszParam )
+    if( nullptr != pszParam )
     {
         *pszParam = _T( '\0' ) ;
 
@@ -288,7 +288,7 @@ HRESULT LaunchURL( LPCWSTR pszURL )
         pchNext = _tcschr( pchFirst + 1, _T( ' ' ) );
     }
 
-    if( NULL == pchNext )
+    if( nullptr == pchNext )
     {
         pchNext = szShellOpenCommand + _tcslen( szShellOpenCommand );
     }
@@ -324,12 +324,12 @@ HRESULT LaunchURL( LPCWSTR pszURL )
         // CreateProcess succeeded and we do not need the handles to the thread
         // or the process, so close them now.
         //
-        if( NULL != ProcInfo.hThread )
+        if( nullptr != ProcInfo.hThread )
         {
             CloseHandle( ProcInfo.hThread );
         }
 
-        if( NULL != ProcInfo.hProcess )
+        if( nullptr != ProcInfo.hProcess )
         {
             CloseHandle( ProcInfo.hProcess );
         }

Core/GameEngine/Source/Common/CRCDebug.cpp

@@ -188,7 +188,7 @@ static AsciiString getFname(AsciiString path)
 
 static void addCRCDebugLineInternal(bool count, const char *fmt, va_list args)
 {
-	if (TheGameLogic == NULL || !(IS_FRAME_OK_TO_LOG))
+	if (TheGameLogic == nullptr || !(IS_FRAME_OK_TO_LOG))
 		return;
 
 	if (lastCRCDebugFrame != TheGameLogic->getFrame())

Core/GameEngine/Source/Common/System/GameMemory.cpp

@@ -616,7 +616,7 @@ inline MemoryPoolSingleBlock *MemoryPoolSingleBlock::getNextRawBlock()
 */
 inline void MemoryPoolSingleBlock::setNextRawBlock(MemoryPoolSingleBlock *b)
 {
-	DEBUG_ASSERTCRASH(m_owningBlob == NULL && (!b || b->m_owningBlob == nullptr), ("must be called on raw block"));
+	DEBUG_ASSERTCRASH(m_owningBlob == nullptr && (!b || b->m_owningBlob == nullptr), ("must be called on raw block"));
 	m_nextBlock = b;
 #ifdef MPSB_DLINK
 	if (b)
@@ -942,7 +942,7 @@ void MemoryPoolSingleBlock::removeBlockFromList(MemoryPoolSingleBlock **pHead)
 {
 	DEBUG_ASSERTCRASH(this->m_owningBlob == nullptr, ("this function should only be used on raw blocks"));
 #ifdef MPSB_DLINK
-	DEBUG_ASSERTCRASH(this->m_nextBlock == NULL || this->m_nextBlock->m_owningBlob == nullptr, ("this function should only be used on raw blocks"));
+	DEBUG_ASSERTCRASH(this->m_nextBlock == nullptr || this->m_nextBlock->m_owningBlob == nullptr, ("this function should only be used on raw blocks"));
 	if (this->m_prevBlock)
 	{
 		DEBUG_ASSERTCRASH(this->m_prevBlock->m_owningBlob == nullptr, ("this function should only be used on raw blocks"));
@@ -1038,11 +1038,11 @@ void MemoryPoolSingleBlock::debugVerifyBlock()
 	DEBUG_ASSERTCRASH(m_debugLiteralTagString != nullptr, ("bad tagstring"));
 	/// @todo Put this check back in after the AI memory usage is under control (MSB)
 	//DEBUG_ASSERTCRASH(m_logicalSize>0 && m_logicalSize < 0x00ffffff, ("unlikely value for m_logicalSize"));
-	DEBUG_ASSERTCRASH(m_nextBlock == NULL
+	DEBUG_ASSERTCRASH(m_nextBlock == nullptr
 		|| memcmp(&m_nextBlock->m_owningBlob, &s_initFillerValue, sizeof(s_initFillerValue)) == 0
 		|| m_nextBlock->m_owningBlob == m_owningBlob, ("owning blob mismatch..."));
 #ifdef MPSB_DLINK
-	DEBUG_ASSERTCRASH(m_prevBlock == NULL
+	DEBUG_ASSERTCRASH(m_prevBlock == nullptr
 		|| memcmp(&m_prevBlock->m_owningBlob, &s_initFillerValue, sizeof(s_initFillerValue)) == 0
 		|| m_prevBlock->m_owningBlob == m_owningBlob, ("owning blob mismatch..."));
 #endif

Core/GameEngine/Source/Common/System/GameMemoryNull.cpp

@@ -108,7 +108,7 @@ void MemoryPoolFactory::debugSetInitFillerIndex(Int index)
 */
 void initMemoryManager()
 {
-	if (TheMemoryPoolFactory == NULL && TheDynamicMemoryAllocator == nullptr)
+	if (TheMemoryPoolFactory == nullptr && TheDynamicMemoryAllocator == nullptr)
 	{
 		TheMemoryPoolFactory = new (malloc(sizeof MemoryPoolFactory)) MemoryPoolFactory;
 		TheDynamicMemoryAllocator = new (malloc(sizeof DynamicMemoryAllocator)) DynamicMemoryAllocator;

Core/GameEngine/Source/Common/System/MiniDumper.cpp

@@ -163,7 +163,7 @@ void MiniDumper::Initialize(const AsciiString& userDirPath)
 	m_dumpComplete = CreateEvent(nullptr, TRUE, FALSE, nullptr);
 	m_quitting = CreateEvent(nullptr, TRUE, FALSE, nullptr);
 
-	if (m_dumpRequested == NULL || m_dumpComplete == NULL || m_quitting == nullptr)
+	if (m_dumpRequested == nullptr || m_dumpComplete == nullptr || m_quitting == nullptr)
 	{
 		// Something went wrong with the creation of the events..
 		DEBUG_LOG(("MiniDumper::Initialize: Unable to create events: error=%u", ::GetLastError()));
@@ -195,7 +195,7 @@ Bool MiniDumper::IsInitialized() const
 Bool MiniDumper::IsDumpThreadStillRunning() const
 {
 	DWORD exitCode;
-	if (m_dumpThread != NULL && ::GetExitCodeThread(m_dumpThread, &exitCode) && exitCode == STILL_ACTIVE)
+	if (m_dumpThread != nullptr && ::GetExitCodeThread(m_dumpThread, &exitCode) && exitCode == STILL_ACTIVE)
 	{
 		return true;
 	}
@@ -352,7 +352,7 @@ void MiniDumper::CreateMiniDump(DumpType dumpType)
 		GitShortSHA1, currentProcessId);
 
 	HANDLE dumpFile = ::CreateFile(m_dumpFile, GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
-	if (dumpFile == NULL || dumpFile == INVALID_HANDLE_VALUE)
+	if (dumpFile == nullptr || dumpFile == INVALID_HANDLE_VALUE)
 	{
 		DEBUG_LOG(("MiniDumper::CreateMiniDump: Unable to create dump file '%s': error=%u", m_dumpFile, ::GetLastError()));
 		return;

Core/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp

@@ -1484,7 +1484,7 @@ void W3DRadar::refreshObjects()
 {
 
 	// sanity
-	if( listHead == NULL || texture == nullptr )
+	if( listHead == nullptr || texture == nullptr )
 		return;
 
 	// get surface for texture to render into

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp

@@ -899,7 +899,7 @@ static void drawAudioLocations( Drawable *draw, void *userData )
 
   const ThingTemplate * thingTemplate = draw->getTemplate();
 
-  if ( thingTemplate == NULL || thingTemplate->getEditorSorting() != ES_AUDIO )
+  if ( thingTemplate == nullptr || thingTemplate->getEditorSorting() != ES_AUDIO )
   {
     return; // All done
   }