refactor: continue refactoring to use strrchr

Author: bobtista

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

@@ -376,15 +376,10 @@ void DebugInit(int flags)
 
 		char dirbuf[ _MAX_PATH ];
 		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
-		char *pEnd = dirbuf + strlen( dirbuf );
-		while( pEnd != dirbuf )
+		char *pEnd = strrchr(dirbuf, '\\');
+		if (pEnd != NULL)
 		{
-			if( *pEnd == '\\' )
-			{
-				*(pEnd + 1) = 0;
-				break;
-			}
-			pEnd--;
+			*(pEnd + 1) = 0;
 		}
 
 		strcpy(theLogFileNamePrev, dirbuf);

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

@@ -113,15 +113,10 @@ void userMemoryManagerInitPools()
 	// we expect. so do it the hard way.
 	char buf[_MAX_PATH];
 	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char* pEnd = buf + strlen(buf);
-	while (pEnd != buf)
+	char* pEnd = strrchr(buf, '\\');
+	if (pEnd != NULL)
 	{
-		if (*pEnd == '\\')
-		{
-			*pEnd = 0;
-			break;
-		}
-		--pEnd;
+		*pEnd = 0;
 	}
 	strlcat(buf, "\\Data\\INI\\MemoryPools.ini", ARRAY_SIZE(buf));
 

Core/Tools/MapCacheBuilder/Source/WinMain.cpp

@@ -224,13 +224,9 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	// Set the current directory to the app directory.
 	char buf[_MAX_PATH];
 	GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	char *pEnd = strrchr(buf, '\\');
+	if (pEnd != NULL) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);
 

Generals/Code/Tools/WorldBuilder/src/BuildList.cpp

@@ -739,15 +739,10 @@ void BuildList::OnExport()
 	try {
 		char dirbuf[ _MAX_PATH ];
 		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
-		char *pEnd = dirbuf + strlen( dirbuf );
-		while( pEnd != dirbuf )
+		char *pEnd = strrchr(dirbuf, '\\');
+		if (pEnd != NULL)
 		{
-			if( *pEnd == '\\' )
-			{
-				*(pEnd + 1) = 0;
-				break;
-			}
-			pEnd--;
+			*(pEnd + 1) = 0;
 		}
 
 		char curbuf[ _MAX_PATH ];

Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp

@@ -1140,13 +1140,9 @@ void ScriptDialog::OnSave()
 	// change it back.
 	char buf[_MAX_PATH];
 	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	char *pEnd = strrchr(buf, '\\');
+	if (pEnd != NULL) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);
 	if (IDCANCEL==result) {
@@ -1357,13 +1353,9 @@ void ScriptDialog::OnLoad()
 	// change it back.
 	char buf[_MAX_PATH];
 	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	char *pEnd = strrchr(buf, '\\');
+	if (pEnd != NULL) {
+		*pEnd = 0;
 	}
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	::SetCurrentDirectory(buf);

Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp

@@ -316,13 +316,9 @@ BOOL CWorldBuilderApp::InitInstance()
 	// Set the current directory to the app directory.
 	char buf[_MAX_PATH];
 	GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	char *pEnd = strrchr(buf, '\\');
+	if (pEnd != NULL) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);
 

Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp

@@ -1359,13 +1359,9 @@ BOOL CWorldBuilderDoc::OnOpenDocument(LPCTSTR lpszPathName)
 
 	WbApp()->setCurrentDirectory(AsciiString(buf));
 	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	char *pEnd = strrchr(buf, '\\');
+	if (pEnd != NULL) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);
 
@@ -2105,15 +2101,10 @@ void CWorldBuilderDoc::OnDumpDocToText(void)
 	try {
 		char dirbuf[ _MAX_PATH ];
 		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
-		char *pEnd = dirbuf + strlen( dirbuf );
-		while( pEnd != dirbuf )
+		char *pEnd = strrchr(dirbuf, '\\');
+		if (pEnd != NULL)
 		{
-			if( *pEnd == '\\' )
-			{
-				*(pEnd + 1) = 0;
-				break;
-			}
-			pEnd--;
+			*(pEnd + 1) = 0;
 		}
 
 		char curbuf[ _MAX_PATH ];

GeneralsMD/Code/Tools/WorldBuilder/src/BuildList.cpp

@@ -739,15 +739,10 @@ void BuildList::OnExport()
 	try {
 		char dirbuf[ _MAX_PATH ];
 		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
-		char *pEnd = dirbuf + strlen( dirbuf );
-		while( pEnd != dirbuf )
+		char *pEnd = strrchr(dirbuf, '\\');
+		if (pEnd != NULL)
 		{
-			if( *pEnd == '\\' )
-			{
-				*(pEnd + 1) = 0;
-				break;
-			}
-			pEnd--;
+			*(pEnd + 1) = 0;
 		}
 
 		char curbuf[ _MAX_PATH ];

GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp

@@ -1295,13 +1295,9 @@ void ScriptDialog::OnSave()
 	// change it back.
 	char buf[_MAX_PATH];
 	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	char *pEnd = strrchr(buf, '\\');
+	if (pEnd != NULL) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);
 	if (IDCANCEL==result) {
@@ -1519,13 +1515,9 @@ void ScriptDialog::OnLoad()
 	// change it back.
 	char buf[_MAX_PATH];
 	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	char *pEnd = strrchr(buf, '\\');
+	if (pEnd != NULL) {
+		*pEnd = 0;
 	}
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	::SetCurrentDirectory(buf);

GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp

@@ -328,13 +328,9 @@ BOOL CWorldBuilderApp::InitInstance()
 	// Set the current directory to the app directory.
 	char buf[_MAX_PATH];
 	GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	char *pEnd = strrchr(buf, '\\');
+	if (pEnd != NULL) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);