refactor(clang-tidy): additional bugprone-suspicious-string-compare fixes

Author: bobtista

Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp

@@ -2590,7 +2590,7 @@ static void roomKeyChangedCallback(PEER peer, RoomType roomType, const char *nic
 	}
 
 #ifdef DEBUG_LOGGING
-	if (strcmp(key, "username") && strcmp(key, "b_flags"))
+	if (strcmp(key, "username") != 0 && strcmp(key, "b_flags") != 0)
 	{
 		DEBUG_LOG(("roomKeyChangedCallback() - %s set %s=%s", nick, key, val));
 	}

Core/GameEngineDevice/Source/StdDevice/Common/StdLocalFileSystem.cpp

@@ -241,7 +241,7 @@ void StdLocalFileSystem::getFileListInDirectory(const AsciiString& currentDirect
 	while (!done)	{
 		std::string filenameStr = iter->path().filename().string();
 		if (!iter->is_directory() && iter->path().extension() == searchExt &&
-			(strcmp(filenameStr.c_str(), ".") != 0 && strcmp(filenameStr.c_str(), ".."))) {
+			(strcmp(filenameStr.c_str(), ".") != 0 && strcmp(filenameStr.c_str(), "..") != 0)) {
 			// if we haven't already, add this filename to the list.
 			// a stl set should only allow one copy of each filename
 			AsciiString newFilename = iter->path().string().c_str();
@@ -268,7 +268,7 @@ void StdLocalFileSystem::getFileListInDirectory(const AsciiString& currentDirect
 		while (!done) {
 			std::string filenameStr = iter->path().filename().string();
 			if(iter->is_directory() &&
-				(strcmp(filenameStr.c_str(), ".") != 0 && strcmp(filenameStr.c_str(), ".."))) {
+				(strcmp(filenameStr.c_str(), ".") != 0 && strcmp(filenameStr.c_str(), "..") != 0)) {
 				AsciiString tempsearchstr(filenameStr.c_str());
 
 				// recursively add files in subdirectories if required.

Core/Libraries/Source/WWVegas/WWDownload/Download.cpp

@@ -47,7 +47,7 @@ HRESULT CDownload::DownloadFile(LPCSTR server, LPCSTR username, LPCSTR password,
 	// If we're still connected, make sure we're on the right server
 	if (m_Status == DOWNLOADSTATUS_FINDINGFILE)
 	{
-		if ((strcmp(m_Server, server) != 0) || (strcmp(m_Login, username)))
+		if ((strcmp(m_Server, server) != 0) || (strcmp(m_Login, username) != 0))
 		{
 			// Damn, a server switch.  Close conn & fix state
 			m_Ftp->DisconnectFromServer();

Core/Libraries/Source/debug/netserv/netserv.cpp

@@ -297,7 +297,7 @@ int CALLBACK WinMain(HINSTANCE,HINSTANCE,LPSTR,int)
     char *input=InputConsole();
     if (input)
     {
-      if (!strcmp(input,"quit"))
+      if (strcmp(input,"quit") == 0)
         break;
     }
 

Core/Libraries/Source/debug/test2/test2.cpp

@@ -51,7 +51,7 @@ class TestCmdInterface: public DebugCmdInterface
   virtual bool Execute(class Debug& dbg, const char *cmd, CommandMode cmdmode,
                        unsigned argn, const char * const * argv)
   {
-    if (strcmp(cmd,"box"))
+    if (strcmp(cmd,"box") != 0)
       return false;
 
     MessageBox(NULL,"Hello world!","Command",MB_OK);

Core/Tools/Autorun/GETCD.cpp

@@ -200,7 +200,7 @@ int	GetCDClass::Get_CD_Drive_For_This_Volume ( const char *volume_label )
 				volume_name[11] = '\0';
 			}
 
-			if ( !_stricmp( volume_label, volume_name )) {
+			if ( _stricmp( volume_label, volume_name ) == 0) {
 				return( cd_drive );
 			}
 
@@ -385,7 +385,7 @@ bool CD_Volume_Verification ( int cd_drive, char *volume_label, char *volume_to_
 				strncpy( volume_label, volume_name, 128 );
 			}
 
-			if ( !_stricmp( volume_to_find, volume_name )) {
+			if ( _stricmp( volume_to_find, volume_name ) == 0) {
 				return TRUE;
 			}
 

Core/Tools/Babylon/Babylon.cpp

@@ -220,7 +220,7 @@ BOOL CALLBACK EnumAllWindowsProcExact(HWND hWnd, LPARAM lParam)
 
 	GetWindowText(hWnd, szText, sizeof(szText));
 
-	if ( !strncmp (szText, szSearchTitle, strlen ( szSearchTitle)))
+	if ( strncmp (szText, szSearchTitle, strlen ( szSearchTitle)) == 0)
 	{
 		* (BOOL *) lParam = TRUE;
 		 FoundWindow = hWnd;

Core/Tools/Babylon/BabylonDlg.cpp

@@ -980,27 +980,27 @@ static int parseComment ( FILE *file, char *buffer, INFO *info )
 		return new_lines;
 	}
 
-	if ( !stricmp ( token, "COMMENT" ) )
+	if ( stricmp ( token, "COMMENT" ) == 0 )
 	{
 		new_lines += getString ( file, buffer, info->comment );
 	}
-	else if ( !stricmp ( token, "CONTEXT" ) )
+	else if ( stricmp ( token, "CONTEXT" ) == 0 )
 	{
 		new_lines += getString ( file, buffer, info->context );
 	}
-	else if ( !stricmp ( token, "SPEAKER" ) )
+	else if ( stricmp ( token, "SPEAKER" ) == 0 )
 	{
 		new_lines += getString ( file, buffer, info->speaker );
 	}
-	else if ( !stricmp ( token, "LISTENER" ) )
+	else if ( stricmp ( token, "LISTENER" ) == 0 )
 	{
 		new_lines += getString ( file, buffer, info->listener );
 	}
-	else if ( !stricmp ( token, "MAXLEN" ) )
+	else if ( stricmp ( token, "MAXLEN" ) == 0 )
 	{
 		info->maxlen = atoi ( buffer );
 	}
-	else if ( !stricmp ( token, "WAVE" ) )
+	else if ( stricmp ( token, "WAVE" ) == 0 )
 	{
 		new_lines += getString ( file, buffer, info->wave );
 	}
@@ -1024,7 +1024,7 @@ static int getLabelCount( char *filename )
 		if( fscanf( fp, "%s", buffer ) == EOF )
 			break;
 
-		if ( !stricmp( buffer, "END" ) )
+		if ( stricmp( buffer, "END" ) == 0 )
 		{
 			count++;
 		}
@@ -1083,7 +1083,7 @@ int CBabylonDlg::LoadStrFile ( TransDB *db, const char *filename, void (*cb) ( v
 			line_number++;
 			removeLeadingAndTrailing ( buffer );
 
-			if ( !stricmp ( buffer, "END" )	)
+			if ( stricmp ( buffer, "END" ) == 0	)
 			{
 				break;
 			}
@@ -1607,7 +1607,7 @@ int CBabylonDlg::UpdateLabel( BabylonLabel *source, BabylonLabel *destination, U
 		if ( (stext = (BabylonText *) dtext->Matched ()) )
 		{
 			// stext is the newer version;
-			if ( wcscmp ( dtext->Get (), stext->Get ()))
+			if ( wcscmp ( dtext->Get (), stext->Get ()) != 0)
 			{
 				if ( update )
 				{
@@ -1617,7 +1617,7 @@ int CBabylonDlg::UpdateLabel( BabylonLabel *source, BabylonLabel *destination, U
 				label_modified = TRUE;
 				info.changes ++;
 			}
-			if ( wcsicmp ( dtext->Wave (), stext->Wave ()))
+			if ( wcsicmp ( dtext->Wave (), stext->Wave ()) != 0)
 			{
 				if ( update )
 				{

Core/Tools/Babylon/TransDB.cpp

@@ -96,7 +96,7 @@ LANGINFO *GetLangInfo ( char *language )
 
 	while ( item->langid != LANGID_UNKNOWN )
 	{
-		if ( !stricmp ( language, item->name ) )
+		if ( stricmp ( language, item->name ) == 0 )
 		{
 			return item;
 		}
@@ -330,7 +330,7 @@ BabylonText*			TransDB::FindSubText		( OLECHAR *pattern, int item )
 		while ( text )
 		{
 
-			if ( !wcsnicmp ( text->Get (), pattern, 15 ))
+			if ( wcsnicmp ( text->Get (), pattern, 15 ) == 0)
 			{
 				if ( !item )
 				{
@@ -692,7 +692,7 @@ BabylonText*			BabylonLabel::FindText ( OLECHAR *find_text )
 
 	while ( txt )
 	{
-		if ( !wcscmp ( txt->Get(), find_text ))
+		if ( wcscmp ( txt->Get(), find_text ) == 0)
 		{
 			return txt;
 		}
@@ -836,25 +836,25 @@ void					BabylonLabel::AddToTree		( CTreeCtrl *tc, HTREEITEM parent, int changes
 		txt = NextText ( sh );
 	}
 
-	if ( strcmp ( CommentSB(), "" ) )
+	if ( strcmp ( CommentSB(), "" ) != 0 )
 	{
 		sprintf ( buffer, "COMMENT : %s", CommentSB() );
 		tc->InsertItem ( buffer, litem );
 	}
 
-	if ( strcmp ( ContextSB(), "" ) )
+	if ( strcmp ( ContextSB(), "" ) != 0 )
 	{
 		sprintf ( buffer, "CONTEXT : %s", ContextSB() );
 		tc->InsertItem ( buffer, litem );
 	}
 
-	if ( strcmp ( SpeakerSB(), "" ) )
+	if ( strcmp ( SpeakerSB(), "" ) != 0 )
 	{
 		sprintf ( buffer, "SPEAKER : %s", SpeakerSB() );
 		tc->InsertItem ( buffer, litem );
 	}
 
-	if ( strcmp ( ListenerSB(), "" ) )
+	if ( strcmp ( ListenerSB(), "" ) != 0 )
 	{
 		sprintf ( buffer, "LISTENER: %s", ListenerSB() );
 		tc->InsertItem ( buffer, litem );
@@ -1341,7 +1341,7 @@ void					BabylonText::AddToTree		( CTreeCtrl *tc, HTREEITEM parent, int changes
 		tc->InsertItem ( buffer, item );
 	}
 
-	if ( strcmp ( WaveSB(), "" ) )
+	if ( strcmp ( WaveSB(), "" ) != 0 )
 	{
 		sprintf ( buffer, "WAVE   : %s", WaveSB() );
 		tc->InsertItem ( buffer, item );
@@ -1411,7 +1411,7 @@ void					Translation::AddToTree		( CTreeCtrl *tc, HTREEITEM parent, int changes
 
 	item = tc->InsertItem ( buffer, parent );
 
-	if ( strcmp ( CommentSB(), "" ) )
+	if ( strcmp ( CommentSB(), "" ) != 0 )
 	{
 		sprintf ( buffer, "COMMENT: %s", CommentSB() );
 		tc->InsertItem ( buffer, item );

Core/Tools/assetcull/assetcull.cpp

@@ -69,7 +69,7 @@ static bool filesEqual(const char *fn1, const char *fn2)
     if (fread(buf1,cur,1,f1)!=1||
         fread(buf2,cur,1,f2)!=1)
       break;
-    if (memcmp(buf1,buf2,cur))
+    if (memcmp(buf1,buf2,cur) != 0)
       break;
     k+=cur;
   }
@@ -105,7 +105,7 @@ static int recursiveCull(FILE *batchFile,
   {
     if (fd.attrib&_A_SUBDIR)
     {
-      if (strcmp(fd.name,".")&&
+      if (strcmp(fd.name,".") != 0&&
           strcmp(fd.name,".."))
         subdir.push_back(fd.name);
     }