From bdaaf508dbb49891fa81c34d99557cba4e5bb6b6 Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@jsg.id.au>
Date: Sun, 28 Apr 2013 12:43:39 +1000
Subject: [PATCH] strcmpi -> Q_strcmpi

---
 CODE-mp/client/0_SH_Leak.cpp       |  4 ++--
 CODE-mp/game/q_shared.h            |  2 ++
 CODE-mp/null/win_main.cpp          |  2 +-
 CODE-mp/qcommon/GenericParser2.cpp | 12 ++++++------
 CODE-mp/win32/win_main.cpp         |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CODE-mp/client/0_SH_Leak.cpp b/CODE-mp/client/0_SH_Leak.cpp
index ae13d49..caf294c 100644
--- a/CODE-mp/client/0_SH_Leak.cpp
+++ b/CODE-mp/client/0_SH_Leak.cpp
@@ -128,7 +128,7 @@ MEM_BOOL MEM_CALLBACK MyMemReporter2(MEM_ERROR_INFO *info)
 	{
 		if (StackCache[i]<0||StackCache[i]>=nStack)
 			continue;
-		if (!strcmpi(start,StackNames[StackCache[i]]))
+		if (!Q_strcmpi(start,StackNames[StackCache[i]]))
 			break;
 	}
 	if (i<48)
@@ -140,7 +140,7 @@ MEM_BOOL MEM_CALLBACK MyMemReporter2(MEM_ERROR_INFO *info)
 	{
 		for (i=0;i<nStack;i++)
 		{
-			if (!strcmpi(start,StackNames[i]))
+			if (!Q_strcmpi(start,StackNames[i]))
 				break;
 		}
 		if (i<nStack)
diff --git a/CODE-mp/game/q_shared.h b/CODE-mp/game/q_shared.h
index c944246..554753b 100644
--- a/CODE-mp/game/q_shared.h
+++ b/CODE-mp/game/q_shared.h
@@ -1065,8 +1065,10 @@ char	*Q_strrchr( const char* string, int c );
 // NON-portable (but faster) versions
 #ifdef WIN32
 static inline int	Q_strnicmp (const char *s1, const char *s2, int n) { return strnicmp(s1, s2, n); }
+static inline int	Q_strcmpi (const char *s1, const char *s2) { return strcmpi(s1, s2); }
 #else
 static inline int	Q_strnicmp (const char *s1, const char *s2, int n) { return strncasecmp(s1, s2, n); }
+static inline int	Q_strcmpi (const char *s1, const char *s2) { return strcasecmp(s1, s2); }
 #endif
 
 // buffer size safe library replacements
diff --git a/CODE-mp/null/win_main.cpp b/CODE-mp/null/win_main.cpp
index 69615cb..d3e96f2 100644
--- a/CODE-mp/null/win_main.cpp
+++ b/CODE-mp/null/win_main.cpp
@@ -639,7 +639,7 @@ static qboolean Sys_ScanForCD( void ) {
 			Result = GetVolumeInformation(drive,VolumeName,sizeof(VolumeName),&VolumeSerialNumber,
 				&MaximumComponentLength,&FileSystemFlags,FileSystemName,sizeof(FileSystemName));
 			
-			if (Result && (strcmpi(VolumeName,"JEDIOUTCAST") == 0 ) )
+			if (Result && (Q_strcmpi(VolumeName,"JEDIOUTCAST") == 0 ) )
 			{
 				sprintf (test, "%s%s\\%s",drive, CD_BASEDIR, CD_EXE);
 				f = fopen( test, "r" );
diff --git a/CODE-mp/qcommon/GenericParser2.cpp b/CODE-mp/qcommon/GenericParser2.cpp
index 6826466..0d20e33 100644
--- a/CODE-mp/qcommon/GenericParser2.cpp
+++ b/CODE-mp/qcommon/GenericParser2.cpp
@@ -315,7 +315,7 @@ void CGPValue::Parse(char **dataPtr, CTextPool **textPool)
 		{	// end of data - error!
 			break;
 		}
-		else if (strcmpi(token, "]") == 0)
+		else if (Q_strcmpi(token, "]") == 0)
 		{	// ending brace for this list
 			break;
 		}
@@ -453,7 +453,7 @@ void CGPGroup::SortObject(CGPObject *object, CGPObject **unsortedList, CGPObject
 		last = 0;
 		while(test)
 		{
-			if (strcmpi(object->GetName(), test->GetName()) < 0)
+			if (Q_strcmpi(object->GetName(), test->GetName()) < 0)
 			{
 				break;
 			}
@@ -537,7 +537,7 @@ void CGPGroup::Parse(char **dataPtr, CTextPool **textPool)
 		{	// end of data - error!
 			break;
 		}
-		else if (strcmpi(token, "}") == 0)
+		else if (Q_strcmpi(token, "}") == 0)
 		{	// ending brace for this group
 			break;
 		}
@@ -546,14 +546,14 @@ void CGPGroup::Parse(char **dataPtr, CTextPool **textPool)
 
 		// read ahead to see what we are doing
 		token = GetToken(dataPtr, true, true);
-		if (strcmpi(token, "{") == 0)
+		if (Q_strcmpi(token, "{") == 0)
 		{	// new sub group
 			name = (*textPool)->AllocText(lastToken, true, textPool);
 			newSubGroup = AddGroup(name);
 			newSubGroup->SetWriteable(mWriteable);
 			newSubGroup->Parse(dataPtr, textPool);
 		}
-		else if (strcmpi(token, "[") == 0)
+		else if (Q_strcmpi(token, "[") == 0)
 		{	// new pair list
 			name = (*textPool)->AllocText(lastToken, true, textPool);
 			newPair = AddPair(name, 0);
@@ -620,7 +620,7 @@ const char *CGPGroup::FindPairValue(const char *key, const char *defaultVal)
 
 	while(mPair)
 	{
-		if (strcmpi(mPair->GetName(), key) == 0)
+		if (Q_strcmpi(mPair->GetName(), key) == 0)
 		{
 			return mPair->GetTopValue();
 		}
diff --git a/CODE-mp/win32/win_main.cpp b/CODE-mp/win32/win_main.cpp
index b339bbf..f9b204a 100644
--- a/CODE-mp/win32/win_main.cpp
+++ b/CODE-mp/win32/win_main.cpp
@@ -718,7 +718,7 @@ static qboolean Sys_ScanForCD( void ) {
 			Result = GetVolumeInformation(drive,VolumeName,sizeof(VolumeName),&VolumeSerialNumber,
 				&MaximumComponentLength,&FileSystemFlags,FileSystemName,sizeof(FileSystemName));
 			
-			if (Result && (strcmpi(VolumeName,"JEDIOUTCAST") == 0 ) )
+			if (Result && (Q_strcmpi(VolumeName,"JEDIOUTCAST") == 0 ) )
 			{
 				sprintf (test, "%s%s\\%s",drive, CD_BASEDIR, CD_EXE);
 				f = fopen( test, "r" );