fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-09 01:01:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

replaced all usess of vsprintf by q_vsnprintf

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@320 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2010-08-31 16:57:12 +00:00
parent 20c394edea
commit e08d6cf1e3
6 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Quake/common.c
View file

@ -1298,7 +1298,7 @@ char *va (const char *format, ...)
va_buf = get_va_buffer (); va_buf = get_va_buffer ();
va_start (argptr, format); va_start (argptr, format);
vsprintf (va_buf, format, argptr); q_vsnprintf (va_buf, VA_BUFFERLEN, format, argptr);
va_end (argptr); va_end (argptr);
return va_buf; return va_buf;

13
Quake/console.c
View file

@ -497,7 +497,6 @@ Handles cursor positioning, line wrapping, etc
================ ================
*/ */
#define MAXPRINTMSG 4096 #define MAXPRINTMSG 4096
// FIXME: make a buffer size safe vsprintf?
void Con_Printf (const char *fmt, ...) void Con_Printf (const char *fmt, ...)
{ {
va_list argptr; va_list argptr;
@ -505,7 +504,7 @@ void Con_Printf (const char *fmt, ...)
static qboolean inupdate; static qboolean inupdate;
va_start (argptr,fmt); va_start (argptr,fmt);
vsprintf (msg,fmt,argptr); q_vsnprintf (msg, sizeof(msg), fmt, argptr);
va_end (argptr); va_end (argptr);
// also echo to debugging console // also echo to debugging console
@ -549,7 +548,7 @@ void Con_Warning (const char *fmt, ...)
char msg[MAXPRINTMSG]; char msg[MAXPRINTMSG];
va_start (argptr,fmt); va_start (argptr,fmt);
vsprintf (msg,fmt,argptr); q_vsnprintf (msg, sizeof(msg), fmt, argptr);
va_end (argptr); va_end (argptr);
Con_SafePrintf ("\x02Warning: "); Con_SafePrintf ("\x02Warning: ");
@ -572,7 +571,7 @@ void Con_DPrintf (const char *fmt, ...)
return; // don't confuse non-developers with techie stuff... return; // don't confuse non-developers with techie stuff...
va_start (argptr,fmt); va_start (argptr,fmt);
vsprintf (msg,fmt,argptr); q_vsnprintf (msg, sizeof(msg), fmt, argptr);
va_end (argptr); va_end (argptr);
Con_SafePrintf ("%s", msg); //johnfitz -- was Con_Printf Con_SafePrintf ("%s", msg); //johnfitz -- was Con_Printf
@ -593,7 +592,7 @@ void Con_DPrintf2 (const char *fmt, ...)
if (developer.value >= 2) if (developer.value >= 2)
{ {
va_start (argptr,fmt); va_start (argptr,fmt);
vsprintf (msg,fmt,argptr); q_vsnprintf (msg, sizeof(msg), fmt, argptr);
va_end (argptr); va_end (argptr);
Con_Printf ("%s", msg); Con_Printf ("%s", msg);
@ -615,7 +614,7 @@ void Con_SafePrintf (const char *fmt, ...)
int temp; int temp;
va_start (argptr,fmt); va_start (argptr,fmt);
vsprintf (msg,fmt,argptr); q_vsnprintf (msg, sizeof(msg), fmt, argptr);
va_end (argptr); va_end (argptr);
temp = scr_disabled_for_loading; temp = scr_disabled_for_loading;
@ -640,7 +639,7 @@ void Con_CenterPrintf (int linewidth, const char *fmt, ...)
int len, s; int len, s;
va_start (argptr,fmt); va_start (argptr,fmt);
vsprintf (msg,fmt,argptr); q_vsnprintf (msg, sizeof(msg), fmt, argptr);
va_end (argptr); va_end (argptr);
linewidth = min (linewidth, con_linewidth); linewidth = min (linewidth, con_linewidth);

10
Quake/host.c
View file

@ -115,7 +115,7 @@ void Host_EndGame (const char *message, ...)
char string[1024]; char string[1024];
va_start (argptr,message); va_start (argptr,message);
vsprintf (string,message,argptr); q_vsnprintf (string, sizeof(string), message, argptr);
va_end (argptr); va_end (argptr);
Con_DPrintf ("Host_EndGame: %s\n",string); Con_DPrintf ("Host_EndGame: %s\n",string);
@ -153,7 +153,7 @@ void Host_Error (const char *error, ...)
SCR_EndLoadingPlaque (); // reenable screen updates SCR_EndLoadingPlaque (); // reenable screen updates
va_start (argptr,error); va_start (argptr,error);
vsprintf (string,error,argptr); q_vsnprintf (string, sizeof(string), error, argptr);
va_end (argptr); va_end (argptr);
Con_Printf ("Host_Error: %s\n",string); Con_Printf ("Host_Error: %s\n",string);
@ -331,7 +331,7 @@ void SV_ClientPrintf (const char *fmt, ...)
char string[1024]; char string[1024];
va_start (argptr,fmt); va_start (argptr,fmt);
vsprintf (string, fmt,argptr); q_vsnprintf (string, sizeof(string), fmt,argptr);
va_end (argptr); va_end (argptr);
MSG_WriteByte (&host_client->message, svc_print); MSG_WriteByte (&host_client->message, svc_print);
@ -352,7 +352,7 @@ void SV_BroadcastPrintf (const char *fmt, ...)
int i; int i;
va_start (argptr,fmt); va_start (argptr,fmt);
vsprintf (string, fmt,argptr); q_vsnprintf (string, sizeof(string), fmt, argptr);
va_end (argptr); va_end (argptr);
for (i=0 ; i<svs.maxclients ; i++) for (i=0 ; i<svs.maxclients ; i++)
@ -376,7 +376,7 @@ void Host_ClientCommands (const char *fmt, ...)
char string[1024]; char string[1024];
va_start (argptr,fmt); va_start (argptr,fmt);
vsprintf (string, fmt,argptr); q_vsnprintf (string, sizeof(string), fmt, argptr);
va_end (argptr); va_end (argptr);
MSG_WriteByte (&host_client->message, svc_stufftext); MSG_WriteByte (&host_client->message, svc_stufftext);

2
Quake/pr_exec.c
View file

@ -268,7 +268,7 @@ void PR_RunError (const char *error, ...)
char string[1024]; char string[1024];
va_start (argptr,error); va_start (argptr,error);
vsprintf (string,error,argptr); q_vsnprintf (string, sizeof(string), error, argptr);
va_end (argptr); va_end (argptr);
PR_PrintStatement (pr_statements + pr_xstatement); PR_PrintStatement (pr_statements + pr_xstatement);

2
Quake/sys_sdl_unix.c
View file

@ -163,7 +163,7 @@ void Sys_Error (const char *error, ...)
Host_Shutdown (); Host_Shutdown ();
va_start (argptr, error); va_start (argptr, error);
vsprintf (text, error, argptr); q_vsnprintf (text, sizeof(text), error, argptr);
va_end (argptr); va_end (argptr);
fputs (errortxt2, stderr); fputs (errortxt2, stderr);

4
Quake/sys_sdl_win.c
View file

@ -175,7 +175,7 @@ void Sys_Error (const char *error, ...)
DWORD dummy; DWORD dummy;
va_start (argptr, error); va_start (argptr, error);
vsprintf (text, error, argptr); q_vsnprintf (text, sizeof(text), error, argptr);
va_end (argptr); va_end (argptr);
if (isDedicated) if (isDedicated)
@ -210,7 +210,7 @@ void Sys_Printf (const char *fmt, ...)
DWORD dummy; DWORD dummy;
va_start (argptr,fmt); va_start (argptr,fmt);
vsprintf (text, fmt, argptr); q_vsnprintf (text, sizeof(text), fmt, argptr);
va_end (argptr); va_end (argptr);
if (isDedicated) if (isDedicated)