more C23 fixes

Author: erysdren

engine/client/cl_main.c

@@ -1719,7 +1719,7 @@ static void CL_BeginServerConnect(char *chain, int port, qboolean noproxy, enum
 			char *e = strchr(arglist, '&');
 			if (e)
 				*e=0;
-			if (!strncasecmp(arglist, "fp=", 3))
+			if (!Q_strncasecmp(arglist, "fp=", 3))
 			{
 				size_t l = 8*Base64_DecodeBlock(arglist+3, arglist+strlen(arglist), connectinfo.peercred.digest, sizeof(connectinfo.peercred.digest));
 				if (l <= 160)

engine/client/in_generic.c

@@ -1170,17 +1170,17 @@ qboolean IN_SetHandPosition(const char *devname, vec3_t org, vec3_t ang, vec3_t
 	int dtype;
 	int seat;
 	struct vrdevinfo_s *dev;
-	if (!strncasecmp(devname, "left", 4))
+	if (!Q_strncasecmp(devname, "left", 4))
 	{
 		seat = atoi(devname+4);
 		dtype = VRDEV_LEFT;
 	}
-	else if (!strncasecmp(devname, "right", 5))
+	else if (!Q_strncasecmp(devname, "right", 5))
 	{
 		seat = atoi(devname+5);
 		dtype = VRDEV_RIGHT;
 	}
-	else if (!strncasecmp(devname, "head", 4))
+	else if (!Q_strncasecmp(devname, "head", 4))
 	{
 		seat = atoi(devname+4);
 		dtype = VRDEV_HEAD;

engine/client/m_multi.c

@@ -617,7 +617,7 @@ qboolean MultiBeginGame (union menuoption_s *option,struct emenu_s *menu, int ke
 				continue;
 			break;
 		}
-		if (*shn || !*hostname || !strcasecmp(hostname, "player") || !strcasecmp(hostname, "unnamed"))	//not simple enough...
+		if (*shn || !*hostname || !Q_strcasecmp(hostname, "player") || !Q_strcasecmp(hostname, "unnamed"))	//not simple enough...
 			Cbuf_AddText(va("sv_public \"/\"\n"), RESTRICT_LOCAL);
 		else
 			Cbuf_AddText(va("sv_public \"/%s\"\n", info->hostnameedit->text), RESTRICT_LOCAL);
@@ -802,7 +802,7 @@ void M_Menu_GameOptions_f (void)
 	info->numplayers	= MC_AddCombo	(menu, 64, 160, y,			localtext("Max players"), (const char **)numplayeroptions,	players);y+=8;
 
 	info->deathmatch	= MC_AddCombo	(menu, 64, 160, y,			localtext("Deathmatch"), (const char **)deathmatchoptions,	deathmatch.value);y+=8;
-	info->teamplay		= MC_AddCombo	(menu, 64, 160, y,			localtext("Teamplay"), (!strcasecmp(FS_GetGamedir(true), "rogue")?(const char **)teamplayoptions_rogue:(const char **)teamplayoptions),		teamplay.value);y+=8;
+	info->teamplay		= MC_AddCombo	(menu, 64, 160, y,			localtext("Teamplay"), (!Q_strcasecmp(FS_GetGamedir(true), "rogue")?(const char **)teamplayoptions_rogue:(const char **)teamplayoptions),		teamplay.value);y+=8;
 	info->skill			= MC_AddCombo	(menu, 64, 160, y,			localtext("Skill"), (const char **)skilloptions,			skill.value);y+=8;
 	info->rundedicated	= MC_AddCheckBox(menu, 64, 160, y,			localtext("dedicated"), NULL, 0);y+=8;
 	y+=8;

engine/common/bothdefs.h

@@ -861,8 +861,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 		#define strnicmp _strnicmp
 	#else
 		//Posix
-		#define stricmp strcasecmp
-		#define strnicmp strncasecmp
+		#define stricmp Q_strcasecmp
+		#define strnicmp Q_strncasecmp
 	#endif
 #endif
 

engine/common/cvar.c

@@ -52,7 +52,7 @@ void *AHash_GetInsensitive(ahashtable_t *table, const char *name)
 	if (b)
 		for (i = 0; i < b->numentries; i++)
 		{
-			if (!strcasecmp(b->entry[i].string, name))
+			if (!Q_strcasecmp(b->entry[i].string, name))
 				return b->entry[i].data;
 		}
 	return NULL;
@@ -64,7 +64,7 @@ void AHash_RemoveDataInsensitive(ahashtable_t *table, const char *name, void *da
 	size_t i;
 	for (i = 0; i < b->numentries; i++)
 	{
-		if (b->entry[i].data == data && !strcasecmp(b->entry[i].string, name))
+		if (b->entry[i].data == data && !Q_strcasecmp(b->entry[i].string, name))
 		{
 			//strip it.
 			b->numentries--;

engine/common/fs.c

@@ -3923,7 +3923,7 @@ static int QDECL FS_SortWildDataFiles(const void *va, const void *vb)
 		return a->mtime > b->mtime;
 
 	//then fall back and sort by name
-	return strcasecmp(na, nb);
+	return Q_strcasecmp(na, nb);
 }
 static void FS_LoadWildDataFiles (filelist_t *list, wildpaks_t *wp)
 {
@@ -7741,7 +7741,7 @@ static int QDECL Mods_AddGamedir(const char *fname, qofs_t fsize, time_t mtime,
 			desc = NULL;
 			for (u = 0; u < Cmd_Argc(); u+=2)
 			{
-				if (!strcasecmp(Cmd_Argv(u), "game"))
+				if (!Q_strcasecmp(Cmd_Argv(u), "game"))
 					desc = Cmd_Argv(u+1);
 			}
 			if (desc)

engine/common/json.c

@@ -489,11 +489,11 @@ json_t *JSON_ParseNode(json_t *t, const char *namestart, const char *nameend, st
 			{
 				if (JSON_ParseString(ctx, &childstart, &childend))
 				{
-					if (childend-childstart == 4 && !strncasecmp(childstart, "true", 4))
+					if (childend-childstart == 4 && !Q_strncasecmp(childstart, "true", 4))
 						return JSON_CreateNode(t, namestart, nameend, childstart, childend, json_type_true);
-					else if (childend-childstart == 5 && !strncasecmp(childstart, "false", 5))
+					else if (childend-childstart == 5 && !Q_strncasecmp(childstart, "false", 5))
 						return JSON_CreateNode(t, namestart, nameend, childstart, childend, json_type_false);
-					else if (childend-childstart == 4 && !strncasecmp(childstart, "null", 4))
+					else if (childend-childstart == 4 && !Q_strncasecmp(childstart, "null", 4))
 						return JSON_CreateNode(t, namestart, nameend, childstart, childend, json_type_null);
 					else
 						return JSON_CreateNode(t, namestart, nameend, childstart, childend, json_type_number);

plugins/plugin.h

@@ -43,8 +43,8 @@
 #		define Q_snprintf snprintf
 #	endif
 #else
-#	define stricmp strcasecmp
-#	define strnicmp strncasecmp
+#	define stricmp Q_strcasecmp
+#	define strnicmp Q_strncasecmp
 #endif
 
 #include <string.h>

plugins/quake3/clq3_ui.c

@@ -1335,7 +1335,7 @@ static qintptr_t UI_SystemCalls(void *offset, quintptr_t mask, qintptr_t fn, con
 			serverinfo_t *s1 = masterfuncs->InfoForNum(VM_LONG(arg[3]));
 			serverinfo_t *s2 = masterfuncs->InfoForNum(VM_LONG(arg[4]));
 			if (keyisstring[key])
-				ret = strcasecmp(masterfuncs->ReadKeyString(s2, q3tofte[key]), masterfuncs->ReadKeyString(s1, q3tofte[key]));
+				ret = Q_strcasecmp(masterfuncs->ReadKeyString(s2, q3tofte[key]), masterfuncs->ReadKeyString(s1, q3tofte[key]));
 			else
 			{
 				ret = masterfuncs->ReadKeyFloat(s2, q3tofte[key]) - masterfuncs->ReadKeyFloat(s1, q3tofte[key]);