Merge pull request ddnet#9614 from Pioooooo/refactor-nullptr

Replace zero constants with nullptr

Author: edg-l

src/base/system.cpp

@@ -23,7 +23,7 @@ static int str_utf8_skeleton(int ch, const int **skeleton, int *skeleton_len)
 			break;
 		}
 	}
-	*skeleton = NULL;
+	*skeleton = nullptr;
 	*skeleton_len = 1;
 	return 0;
 }
@@ -37,7 +37,7 @@ struct SKELETON
 
 static void str_utf8_skeleton_begin(struct SKELETON *skel, const char *str)
 {
-	skel->skeleton = NULL;
+	skel->skeleton = nullptr;
 	skel->skeleton_len = 0;
 	skel->str = str;
 }
@@ -55,7 +55,7 @@ static int str_utf8_skeleton_next(struct SKELETON *skel)
 		str_utf8_skeleton(ch, &skel->skeleton, &skel->skeleton_len);
 	}
 	skel->skeleton_len--;
-	if(skel->skeleton != NULL)
+	if(skel->skeleton != nullptr)
 	{
 		ch = *skel->skeleton;
 		skel->skeleton++;

src/base/unicode/confusables.cpp

@@ -16,7 +16,7 @@ int str_utf8_tolower(int code)
 	key.upper = code;
 	res = (UPPER_LOWER *)bsearch(&key, tolowermap, NUM_TOLOWER, sizeof(struct UPPER_LOWER), compul);
 
-	if(res == NULL)
+	if(res == nullptr)
 		return code;
 	return res->lower;
 }

src/base/unicode/tolower.cpp

@@ -209,7 +209,7 @@ void CCommandProcessorFragment_SDL::Cmd_Init(const SCommand_Init *pCommand)
 void CCommandProcessorFragment_SDL::Cmd_Shutdown(const SCommand_Shutdown *pCommand)
 {
 	if(m_GLContext)
-		SDL_GL_MakeCurrent(NULL, NULL);
+		SDL_GL_MakeCurrent(nullptr, nullptr);
 }
 
 void CCommandProcessorFragment_SDL::Cmd_Swap(const CCommandBuffer::SCommand_Swap *pCommand)
@@ -909,8 +909,8 @@ void CGraphicsBackend_SDL_GL::GetVideoModes(CVideoMode *pModes, int MaxModes, in
 
 	// Only collect fullscreen modes when requested, that makes sure in windowed mode no refresh rates are shown that aren't supported without
 	// fullscreen anyway(except fullscreen desktop)
-	bool IsFullscreenDestkop = m_pWindow != NULL && (((SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) || g_Config.m_GfxFullscreen == 3);
-	bool CollectFullscreenModes = m_pWindow == NULL || ((SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN) != 0 && !IsFullscreenDestkop);
+	bool IsFullscreenDestkop = m_pWindow != nullptr && (((SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) || g_Config.m_GfxFullscreen == 3);
+	bool CollectFullscreenModes = m_pWindow == nullptr || ((SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN) != 0 && !IsFullscreenDestkop);
 
 	if(SDL_GetDesktopDisplayMode(ScreenId, &DesktopMode) < 0)
 	{
@@ -1203,7 +1203,7 @@ int CGraphicsBackend_SDL_GL::Init(const char *pName, int *pScreen, int *pWidth,
 		SdlFlags);
 
 	// set caption
-	if(m_pWindow == NULL)
+	if(m_pWindow == nullptr)
 	{
 		dbg_msg("gfx", "unable to create window: %s", SDL_GetError());
 		if(m_BackendType == BACKEND_TYPE_VULKAN)
@@ -1220,7 +1220,7 @@ int CGraphicsBackend_SDL_GL::Init(const char *pName, int *pScreen, int *pWidth,
 	{
 		m_GLContext = SDL_GL_CreateContext(m_pWindow);
 
-		if(m_GLContext == NULL)
+		if(m_GLContext == nullptr)
 		{
 			SDL_DestroyWindow(m_pWindow);
 			m_pWindow = nullptr;
@@ -1238,7 +1238,7 @@ int CGraphicsBackend_SDL_GL::Init(const char *pName, int *pScreen, int *pWidth,
 	}
 
 	int InitError = 0;
-	const char *pErrorStr = NULL;
+	const char *pErrorStr = nullptr;
 
 	InitError = IsVersionSupportedGlew(m_BackendType, g_Config.m_GfxGLMajor, g_Config.m_GfxGLMinor, g_Config.m_GfxGLPatch, GlewMajor, GlewMinor, GlewPatch);
 
@@ -1251,7 +1251,7 @@ int CGraphicsBackend_SDL_GL::Init(const char *pName, int *pScreen, int *pWidth,
 	if(IsOpenGLFamilyBackend)
 	{
 		SDL_GL_SetSwapInterval(Flags & IGraphicsBackend::INITFLAG_VSYNC ? 1 : 0);
-		SDL_GL_MakeCurrent(NULL, NULL);
+		SDL_GL_MakeCurrent(nullptr, nullptr);
 	}
 
 	if(InitError != 0)
@@ -1372,7 +1372,7 @@ int CGraphicsBackend_SDL_GL::Init(const char *pName, int *pScreen, int *pWidth,
 			g_Config.m_GfxGLPatch = m_Capabilites.m_ContextPatch;
 		}
 
-		if(pErrorStr != NULL)
+		if(pErrorStr != nullptr)
 		{
 			str_copy(m_aErrorString, pErrorStr);
 		}

src/engine/client/backend_sdl.cpp

@@ -279,7 +279,7 @@ class CGraphicsBackend_SDL_GL : public CGraphicsBackend_Threaded
 		if(m_aErrorString[0] != '\0')
 			return m_aErrorString;
 
-		return NULL;
+		return nullptr;
 	}
 
 	const char *GetVendorString() override

src/engine/client/backend_sdl.h

@@ -55,12 +55,12 @@ static SBackEndDriverBlockList gs_aBlockList[] = {
 
 const char *ParseBlocklistDriverVersions(const char *pVendorStr, const char *pVersionStr, int &BlocklistMajor, int &BlocklistMinor, int &BlocklistPatch, bool &RequiresWarning)
 {
-	if(str_find_nocase(pVendorStr, "Intel") == NULL)
-		return NULL;
+	if(str_find_nocase(pVendorStr, "Intel") == nullptr)
+		return nullptr;
 
 	const char *pVersionStrStart = str_find_nocase(pVersionStr, "Build ");
-	if(pVersionStrStart == NULL)
-		return NULL;
+	if(pVersionStrStart == nullptr)
+		return nullptr;
 
 	// ignore "Build ", after that, it should directly start with the driver version
 	pVersionStrStart += (ptrdiff_t)str_length("Build ");
@@ -71,8 +71,8 @@ const char *ParseBlocklistDriverVersions(const char *pVendorStr, const char *pVe
 	for(int &VersionPart : Version.m_aParts)
 	{
 		pVersionStrStart = str_next_token(pVersionStrStart, ".", aVersionStrHelper, sizeof(aVersionStrHelper));
-		if(pVersionStrStart == NULL)
-			return NULL;
+		if(pVersionStrStart == nullptr)
+			return nullptr;
 
 		VersionPart = str_toint(aVersionStrHelper);
 	}
@@ -84,7 +84,7 @@ const char *ParseBlocklistDriverVersions(const char *pVendorStr, const char *pVe
 			bool DriverBlocked = false;
 			if(BlockListItem.m_BlockListType == BACKEND_DRIVER_BLOCKLIST_TYPE_VENDOR)
 			{
-				if(str_find_nocase(pVendorStr, BlockListItem.m_pVendorName) != NULL)
+				if(str_find_nocase(pVendorStr, BlockListItem.m_pVendorName) != nullptr)
 				{
 					DriverBlocked = true;
 				}
@@ -108,5 +108,5 @@ const char *ParseBlocklistDriverVersions(const char *pVendorStr, const char *pVe
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }

src/engine/client/blocklist_driver.cpp

@@ -396,7 +396,7 @@ int *CClient::GetInput(int Tick, int IsDummy) const
 
 	if(Best != -1)
 		return (int *)m_aInputs[d][Best].m_aData;
-	return 0;
+	return nullptr;
 }
 
 // ------ state handling -----
@@ -695,8 +695,8 @@ void CClient::DisconnectWithReason(const char *pReason)
 	mem_zero(&m_CurrentServerInfo, sizeof(m_CurrentServerInfo));
 
 	// clear snapshots
-	m_aapSnapshots[0][SNAP_CURRENT] = 0;
-	m_aapSnapshots[0][SNAP_PREV] = 0;
+	m_aapSnapshots[0][SNAP_CURRENT] = nullptr;
+	m_aapSnapshots[0][SNAP_PREV] = nullptr;
 	m_aReceivedSnapshots[0] = 0;
 	m_LastDummy = false;
 
@@ -782,8 +782,8 @@ void CClient::DummyDisconnect(const char *pReason)
 	g_Config.m_ClDummy = 0;
 
 	m_aRconAuthed[1] = 0;
-	m_aapSnapshots[1][SNAP_CURRENT] = 0;
-	m_aapSnapshots[1][SNAP_PREV] = 0;
+	m_aapSnapshots[1][SNAP_CURRENT] = nullptr;
+	m_aapSnapshots[1][SNAP_PREV] = nullptr;
 	m_aReceivedSnapshots[1] = 0;
 	m_DummyConnected = false;
 	m_DummyConnecting = false;
@@ -1018,7 +1018,7 @@ const char *CClient::DummyName()
 	{
 		return g_Config.m_ClDummyName;
 	}
-	const char *pBase = 0;
+	const char *pBase = nullptr;
 	if(g_Config.m_PlayerName[0])
 	{
 		pBase = g_Config.m_PlayerName;
@@ -1106,7 +1106,7 @@ const char *CClient::LoadMap(const char *pName, const char *pFilename, SHA256_DI
 	str_copy(m_aCurrentMap, pName);
 	str_copy(m_aCurrentMapPath, pFilename);
 
-	return 0;
+	return nullptr;
 }
 
 static void FormatMapDownloadFilename(const char *pName, const SHA256_DIGEST *pSha256, int Crc, bool Temp, char *pBuffer, int BufferSize)
@@ -1162,7 +1162,7 @@ const char *CClient::LoadMapSearch(const char *pMapName, SHA256_DIGEST *pWantedS
 	// backward compatibility with old names
 	if(pWantedSha256)
 	{
-		FormatMapDownloadFilename(pMapName, 0, WantedCrc, false, aBuf, sizeof(aBuf));
+		FormatMapDownloadFilename(pMapName, nullptr, WantedCrc, false, aBuf, sizeof(aBuf));
 		pError = LoadMap(pMapName, aBuf, pWantedSha256, WantedCrc);
 		if(!pError)
 			return nullptr;
@@ -1559,7 +1559,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 
 			if(m_DummyConnected && !m_DummyReconnectOnReload)
 			{
-				DummyDisconnect(0);
+				DummyDisconnect(nullptr);
 			}
 
 			ResetMapDownload(true);
@@ -1657,7 +1657,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 				if(m_MapdownloadFileTemp)
 				{
 					io_close(m_MapdownloadFileTemp);
-					m_MapdownloadFileTemp = 0;
+					m_MapdownloadFileTemp = nullptr;
 				}
 				FinishMapDownload();
 			}
@@ -2326,7 +2326,7 @@ void CClient::ResetMapDownload(bool ResetActive)
 	if(m_MapdownloadFileTemp)
 	{
 		io_close(m_MapdownloadFileTemp);
-		m_MapdownloadFileTemp = 0;
+		m_MapdownloadFileTemp = nullptr;
 	}
 
 	if(Storage()->FileExists(m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE))
@@ -2389,7 +2389,7 @@ void CClient::ResetDDNetInfoTask()
 	if(m_pDDNetInfoTask)
 	{
 		m_pDDNetInfoTask->Abort();
-		m_pDDNetInfoTask = NULL;
+		m_pDDNetInfoTask = nullptr;
 	}
 }
 
@@ -2407,7 +2407,7 @@ TVersion ToVersion(char *pStr)
 			return gs_InvalidVersion;
 
 		aVersion[i] = str_toint(p);
-		p = strtok(NULL, ".");
+		p = strtok(nullptr, ".");
 	}
 
 	if(p)
@@ -3273,7 +3273,7 @@ void CClient::Run()
 					if(time_get() > m_BenchmarkStopTime)
 					{
 						io_close(m_BenchmarkFile);
-						m_BenchmarkFile = 0;
+						m_BenchmarkFile = nullptr;
 						Quit();
 					}
 				}
@@ -3567,7 +3567,7 @@ void CClient::AutoCSV_Cleanup()
 void CClient::Con_Screenshot(IConsole::IResult *pResult, void *pUserData)
 {
 	CClient *pSelf = (CClient *)pUserData;
-	pSelf->Graphics()->TakeScreenshot(0);
+	pSelf->Graphics()->TakeScreenshot(nullptr);
 }
 
 #if defined(CONF_VIDEORECORDER)
@@ -3928,7 +3928,7 @@ const char *CClient::DemoPlayer_Play(const char *pFilename, int StorageType)
 	m_DemoPlayer.Play();
 	GameClient()->OnEnterGame();
 
-	return 0;
+	return nullptr;
 }
 
 #if defined(CONF_VIDEORECORDER)
@@ -4009,7 +4009,7 @@ void CClient::DemoRecorder_Start(const char *pFilename, bool WithTimestamp, int
 			m_pMap->Crc(),
 			"client",
 			m_pMap->MapSize(),
-			0,
+			nullptr,
 			m_pMap->File(),
 			nullptr,
 			nullptr);
@@ -5013,7 +5013,7 @@ void CClient::RaceRecord_Start(const char *pFilename)
 			m_pMap->Crc(),
 			"client",
 			m_pMap->MapSize(),
-			0,
+			nullptr,
 			m_pMap->File(),
 			nullptr,
 			nullptr);

src/engine/client/client.cpp

@@ -150,7 +150,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	char m_aMapdownloadFilename[256] = "";
 	char m_aMapdownloadFilenameTemp[256] = "";
 	char m_aMapdownloadName[256] = "";
-	IOHANDLE m_MapdownloadFileTemp = 0;
+	IOHANDLE m_MapdownloadFileTemp = nullptr;
 	int m_MapdownloadChunk = 0;
 	int m_MapdownloadCrc = 0;
 	int m_MapdownloadAmount = -1;
@@ -245,12 +245,12 @@ class CClient : public IClient, public CDemoPlayer::IListener
 
 	CFifo m_Fifo;
 
-	IOHANDLE m_BenchmarkFile = 0;
+	IOHANDLE m_BenchmarkFile = nullptr;
 	int64_t m_BenchmarkStopTime = 0;
 
 	CChecksum m_Checksum;
 	int64_t m_OwnExecutableSize = 0;
-	IOHANDLE m_OwnExecutable = 0;
+	IOHANDLE m_OwnExecutable = nullptr;
 
 	// favorite command handling
 	bool m_FavoritesGroup = false;

src/engine/client/client.h

@@ -14,13 +14,13 @@ CDemoEdit::CDemoEdit(const char *pNetVersion, class CSnapshotDelta *pSnapshotDel
 	m_EndTick = EndTick;
 
 	// Init the demoeditor
-	m_DemoEditor.Init(&m_SnapshotDelta, NULL, pStorage);
+	m_DemoEditor.Init(&m_SnapshotDelta, nullptr, pStorage);
 }
 
 void CDemoEdit::Run()
 {
 	// Slice the current demo
-	m_Success = m_DemoEditor.Slice(m_aDemo, m_aDst, m_StartTick, m_EndTick, NULL, 0);
+	m_Success = m_DemoEditor.Slice(m_aDemo, m_aDst, m_StartTick, m_EndTick, nullptr, nullptr);
 	// We remove the temporary demo file if slicing is successful
 	if(m_Success)
 		m_pStorage->RemoveFile(m_aDemo, IStorage::TYPE_SAVE);

src/engine/client/demoedit.cpp

@@ -100,7 +100,7 @@ IDiscord *CreateDiscordImpl()
 #else
 IDiscord *CreateDiscordImpl()
 {
-	return 0;
+	return nullptr;
 }
 #endif