Various warning fixes (#381)

erysdren · web-flow · commit 3584377302cd · 2026-01-27T05:32:36.000-08:00
* QTV: fix compilation with C23

* CMakeLists.txt: fix empty ELSEIF()

* common.c: fix warning

* sbar.c: rename CHAR_WIDTH to QCHAR_WIDTH to avoid shadowing

* more C23 fixes

* hack to fix iqmtool

* hack to fix httpserver and plugins
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -245,7 +245,7 @@ IF(FREETYPE_FOUND)
 		INCLUDE_DIRECTORIES( ${Fontconfig_INCLUDE_DIRS} )
 		SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};LIBFONTCONFIG_STATIC)
 		SET(FTE_LIBS ${FTE_LIBS} ${Fontconfig_LIBRARIES})
-	ELSEIF()
+	ELSE()
 		MESSAGE(WARNING "fontconfig library NOT available. I hope you're not using any system fonts.")
 	ENDIF()
 ELSE()
diff --git a/engine/client/cl_main.c b/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)
diff --git a/engine/client/in_generic.c b/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;
diff --git a/engine/client/m_multi.c b/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;
diff --git a/engine/client/sbar.c b/engine/client/sbar.c
@@ -335,7 +335,7 @@ static mpic_t *Sbar_Q2CachePic(char *name)
 
 #define	ICON_WIDTH	24
 #define	ICON_HEIGHT	24
-#define	CHAR_WIDTH	16
+#define	QCHAR_WIDTH	16
 #define	ICON_SPACE	8
 static void SCR_DrawField (float x, float y, int color, float width, int value)
 {
@@ -356,7 +356,7 @@ static void SCR_DrawField (float x, float y, int color, float width, int value)
 	l = strlen(num);
 	if (l > width)
 		l = width;
-	x += 2 + CHAR_WIDTH*(width - l);
+	x += 2 + QCHAR_WIDTH*(width - l);
 
 	ptr = num;
 	while (*ptr && l)
@@ -369,7 +369,7 @@ static void SCR_DrawField (float x, float y, int color, float width, int value)
 		p = Sbar_Q2CachePic(q2sb_nums[color][frame]);
 		if (p && R_GetShaderSizes(p, &pw, &ph, false)>0)
 			R2D_ScalePic (x,y,pw, ph, p);
-		x += CHAR_WIDTH;
+		x += QCHAR_WIDTH;
 		ptr++;
 		l--;
 	}
diff --git a/engine/common/bothdefs.h b/engine/common/bothdefs.h
@@ -861,11 +861,22 @@ 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
 
+#if defined(IQMTOOL) || defined(WEBSVONLY) || defined(FTEPLUGIN)
+	#ifdef _WIN32
+		//Windows-specific...
+		#define Q_strcasecmp _stricmp
+		#define Q_strncasecmp _strnicmp
+	#else
+		//Posix
+		#define Q_strcasecmp strcasecmp
+		#define Q_strncasecmp strncasecmp
+	#endif
+#endif
 
 // !!! if this is changed, it must be changed in d_ifacea.h too !!!
 #define CACHE_SIZE	32		// used to align key data structures
diff --git a/engine/common/common.c b/engine/common/common.c
@@ -2513,7 +2513,7 @@ vec3_t	bytedirs[Q2NUMVERTEXNORMALS] =
 };
 #endif
 #ifdef HAVE_CLIENT
-void MSG_ReadDir (vec3_t dir)
+void MSG_ReadDir (float *dir)
 {
 	int		b;
 
diff --git a/engine/common/common.h b/engine/common/common.h
@@ -440,8 +440,10 @@ void QDECL Q_strncpyz(char*d, const char*s, int n);
 
 /*replacement functions which do not care for locale in text formatting ('C' locale), or are non-standard*/
 char *Q_strcasestr(const char *haystack, const char *needle);
+#if !defined(IQMTOOL) && !defined(WEBSVONLY) && !defined(FTEPLUGIN)
 int Q_strncasecmp (const char *s1, const char *s2, int n);
 int Q_strcasecmp (const char *s1, const char *s2);
+#endif
 int Q_strstopcasecmp(const char *s1start, const char *s1end, const char *s2);
 int	Q_atoi (const char *str);
 float Q_atof (const char *str);
diff --git a/engine/common/cvar.c b/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--;
diff --git a/engine/common/fs.c b/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)
diff --git a/engine/common/json.c b/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);
diff --git a/fteqtv/qtv.h b/fteqtv/qtv.h
@@ -296,12 +296,13 @@ size_t CalcHMAC(hashfunc_t *hashfunc, unsigned char *digest, size_t maxdigestsiz
 #include "protocol.h"
 
 
-
-
-#ifndef __cplusplus
+#if !defined(__cplusplus) && (!defined(__STDC_VERSION__) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ < 202311L)))
 typedef enum {false, true} qboolean;
 #else
 typedef int qboolean;
+#endif
+
+#ifdef __cplusplus
 extern "C" {
 #endif
 
diff --git a/plugins/hl2/mat_vmt.c b/plugins/hl2/mat_vmt.c
@@ -76,45 +76,6 @@ static void Q_StrCat(char **ptr, const char *append)
 	*ptr = newptr;
 }
 
-//case comparisons are specific to ascii only, so this should be 'safe' for utf-8 strings too.
-int Q_strncasecmp (const char *s1, const char *s2, int n)
-{
-	int		c1, c2;
-
-	while (1)
-	{
-		c1 = *s1++;
-		c2 = *s2++;
-
-		if (!n--)
-			return 0;		// strings are equal until end point
-
-		if (c1 != c2)
-		{
-			if (c1 >= 'a' && c1 <= 'z')
-				c1 -= ('a' - 'A');
-			if (c2 >= 'a' && c2 <= 'z')
-				c2 -= ('a' - 'A');
-			if (c1 != c2)
-			{	// strings not equal
-				if (c1 > c2)
-					return 1;		// strings not equal
-				return -1;
-			}
-		}
-		if (!c1)
-			return 0;		// strings are equal
-//		s1++;
-//		s2++;
-	}
-
-	return -1;
-}
-int Q_strcasecmp (const char *s1, const char *s2)
-{
-	return Q_strncasecmp (s1, s2, 0x7fffffff);
-}
-
 static qboolean VMT_ReadVMT(const char *materialname, vmtstate_t *st);	//this is made more complicated on account of includes allowing recursion
 static char *VMT_ParseBlock(const char *fname, vmtstate_t *st, char *line)
 {	//assumes the open { was already parsed, but will parse the close.
diff --git a/plugins/plugin.h b/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>
diff --git a/plugins/quake3/clq3_ui.c b/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]);

Original file line number	Diff line number	Diff line change
`@@ -1719,7 +1719,7 @@ static void CL_BeginServerConnect(char *chain, int port, qboolean noproxy, enum`
`1719`	`1719`	`char *e = strchr(arglist, '&');`
`1720`	`1720`	`if (e)`
`1721`	`1721`	`*e=0;`
`1722`		`- if (!strncasecmp(arglist, "fp=", 3))`
	`1722`	`+ if (!Q_strncasecmp(arglist, "fp=", 3))`
`1723`	`1723`	`{`
`1724`	`1724`	`size_t l = 8*Base64_DecodeBlock(arglist+3, arglist+strlen(arglist), connectinfo.peercred.digest, sizeof(connectinfo.peercred.digest));`
`1725`	`1725`	`if (l <= 160)`
Original file line number	Diff line number	Diff line change
`@@ -1170,17 +1170,17 @@ qboolean IN_SetHandPosition(const char *devname, vec3_t org, vec3_t ang, vec3_t`
`1170`	`1170`	`int dtype;`
`1171`	`1171`	`int seat;`
`1172`	`1172`	`struct vrdevinfo_s *dev;`
`1173`		`- if (!strncasecmp(devname, "left", 4))`
	`1173`	`+ if (!Q_strncasecmp(devname, "left", 4))`
`1174`	`1174`	`{`
`1175`	`1175`	`seat = atoi(devname+4);`
`1176`	`1176`	`dtype = VRDEV_LEFT;`
`1177`	`1177`	`}`
`1178`		`- else if (!strncasecmp(devname, "right", 5))`
	`1178`	`+ else if (!Q_strncasecmp(devname, "right", 5))`
`1179`	`1179`	`{`
`1180`	`1180`	`seat = atoi(devname+5);`
`1181`	`1181`	`dtype = VRDEV_RIGHT;`
`1182`	`1182`	`}`
`1183`		`- else if (!strncasecmp(devname, "head", 4))`
	`1183`	`+ else if (!Q_strncasecmp(devname, "head", 4))`
`1184`	`1184`	`{`
`1185`	`1185`	`seat = atoi(devname+4);`
`1186`	`1186`	`dtype = VRDEV_HEAD;`
Original file line number	Diff line number	Diff line change
`@@ -2513,7 +2513,7 @@ vec3_t bytedirs[Q2NUMVERTEXNORMALS] =`
`2513`	`2513`	`};`
`2514`	`2514`	`#endif`
`2515`	`2515`	`#ifdef HAVE_CLIENT`
`2516`		`-void MSG_ReadDir (vec3_t dir)`
	`2516`	`+void MSG_ReadDir (float *dir)`
`2517`	`2517`	`{`
`2518`	`2518`	`int b;`
`2519`	`2519`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ void AHash_GetInsensitive(ahashtable_t table, const char *name)`
`52`	`52`	`if (b)`
`53`	`53`	`for (i = 0; i < b->numentries; i++)`
`54`	`54`	`{`
`55`		`- if (!strcasecmp(b->entry[i].string, name))`
	`55`	`+ if (!Q_strcasecmp(b->entry[i].string, name))`
`56`	`56`	`return b->entry[i].data;`
`57`	`57`	`}`
`58`	`58`	`return NULL;`
`@@ -64,7 +64,7 @@ void AHash_RemoveDataInsensitive(ahashtable_t table, const char name, void *da`
`64`	`64`	`size_t i;`
`65`	`65`	`for (i = 0; i < b->numentries; i++)`
`66`	`66`	`{`
`67`		`- if (b->entry[i].data == data && !strcasecmp(b->entry[i].string, name))`
	`67`	`+ if (b->entry[i].data == data && !Q_strcasecmp(b->entry[i].string, name))`
`68`	`68`	`{`
`69`	`69`	`//strip it.`
`70`	`70`	`b->numentries--;`
Original file line number	Diff line number	Diff line change
`@@ -3923,7 +3923,7 @@ static int QDECL FS_SortWildDataFiles(const void va, const void vb)`
`3923`	`3923`	`return a->mtime > b->mtime;`
`3924`	`3924`
`3925`	`3925`	`//then fall back and sort by name`
`3926`		`- return strcasecmp(na, nb);`
	`3926`	`+ return Q_strcasecmp(na, nb);`
`3927`	`3927`	`}`
`3928`	`3928`	`static void FS_LoadWildDataFiles (filelist_t list, wildpaks_t wp)`
`3929`	`3929`	`{`
`@@ -7741,7 +7741,7 @@ static int QDECL Mods_AddGamedir(const char *fname, qofs_t fsize, time_t mtime,`
`7741`	`7741`	`desc = NULL;`
`7742`	`7742`	`for (u = 0; u < Cmd_Argc(); u+=2)`
`7743`	`7743`	`{`
`7744`		`- if (!strcasecmp(Cmd_Argv(u), "game"))`
	`7744`	`+ if (!Q_strcasecmp(Cmd_Argv(u), "game"))`
`7745`	`7745`	`desc = Cmd_Argv(u+1);`
`7746`	`7746`	`}`
`7747`	`7747`	`if (desc)`