Fix -Wformat-security and -Wformat-extra-args warnings under clang.

git-svn-id: https://svn.eduke32.com/eduke32@2421 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-03-05 07:25:24 +00:00
parent 3fdb7ee8fc
commit 35937454ad
4 changed files with 9 additions and 6 deletions

View file

@ -686,7 +686,7 @@ void initprintf(const char *f, ...)
Bvsnprintf(buf, sizeof(buf), f, va); Bvsnprintf(buf, sizeof(buf), f, va);
va_end(va); va_end(va);
OSD_Printf(buf); OSD_Printf("%s",buf);
mutex_lock(&m_initprintf); mutex_lock(&m_initprintf);
if ((Bstrlen(dabuf) + Bstrlen(buf) + 2) > sizeof(dabuf)) if ((Bstrlen(dabuf) + Bstrlen(buf) + 2) > sizeof(dabuf))

View file

@ -7992,7 +7992,7 @@ static void G_ShowParameterHelp(void)
; ;
#if defined RENDERTYPEWIN #if defined RENDERTYPEWIN
Bsnprintf(tempbuf, sizeof(tempbuf), HEAD2 " %s", s_buildRev); Bsnprintf(tempbuf, sizeof(tempbuf), HEAD2 " %s", s_buildRev);
wm_msgbox(tempbuf,s); wm_msgbox(tempbuf,"%s",s);
#else #else
initprintf("%s\n",s); initprintf("%s\n",s);
#endif #endif
@ -8019,7 +8019,7 @@ static void G_ShowDebugHelp(void)
; ;
#if defined RENDERTYPEWIN #if defined RENDERTYPEWIN
Bsnprintf(tempbuf, sizeof(tempbuf), HEAD2 " %s", s_buildRev); Bsnprintf(tempbuf, sizeof(tempbuf), HEAD2 " %s", s_buildRev);
wm_msgbox(tempbuf,s); wm_msgbox(tempbuf,"%s",s);
#else #else
initprintf("%s\n",s); initprintf("%s\n",s);
#endif #endif
@ -9579,7 +9579,7 @@ static void G_Startup(void)
Bsprintf(tempbuf, "You have run Duke Nukem 3D shareware %d times. It is now time to upgrade to the complete version!\n\n" Bsprintf(tempbuf, "You have run Duke Nukem 3D shareware %d times. It is now time to upgrade to the complete version!\n\n"
"Purchase Duke Nukem 3D for $5.99 now?\n", ud.executions); "Purchase Duke Nukem 3D for $5.99 now?\n", ud.executions);
if (wm_ynbox("Upgrade to the full version of Duke Nukem 3D",tempbuf)) if (wm_ynbox("Upgrade to the full version of Duke Nukem 3D","%s",tempbuf))
{ {
SHELLEXECUTEINFOA sinfo; SHELLEXECUTEINFOA sinfo;
char *p = "http://www.gog.com/en/gamecard/duke_nukem_3d_atomic_edition/?pp=6c1e671f9af5b46d9c1a52067bdf0e53685674f7"; char *p = "http://www.gog.com/en/gamecard/duke_nukem_3d_atomic_edition/?pp=6c1e671f9af5b46d9c1a52067bdf0e53685674f7";

View file

@ -5744,7 +5744,7 @@ void C_Compile(const char *filenam)
"(Clicking yes will bring you to our web store)", "(Clicking yes will bring you to our web store)",
g_grpNamePtr,g_grpNamePtr); g_grpNamePtr,g_grpNamePtr);
if (wm_ynbox("Important - Duke Nukem 3D not found - EDuke32",tempbuf)) if (wm_ynbox("Important - Duke Nukem 3D not found - EDuke32","%s",tempbuf))
{ {
SHELLEXECUTEINFOA sinfo; SHELLEXECUTEINFOA sinfo;
char *p = "http://www.gog.com/en/gamecard/duke_nukem_3d_atomic_edition/?pp=6c1e671f9af5b46d9c1a52067bdf0e53685674f7"; char *p = "http://www.gog.com/en/gamecard/duke_nukem_3d_atomic_edition/?pp=6c1e671f9af5b46d9c1a52067bdf0e53685674f7";

View file

@ -3476,7 +3476,10 @@ cheat_for_port_credits:
mgametext(c+168,50-8,tempbuf,MENUHIGHLIGHT(0),2+8+16); mgametext(c+168,50-8,tempbuf,MENUHIGHLIGHT(0),2+8+16);
menutext(c,50+16,MENUHIGHLIGHT(1),0,"RENDERER"); menutext(c,50+16,MENUHIGHLIGHT(1),0,"RENDERER");
Bsprintf(tempbuf,(vidsets[newvidset]&0x20000)?"%d-bit OpenGL":"Software", vidsets[newvidset]&0x0ffff); if (vidsets[newvidset]&0x20000)
Bsprintf(tempbuf,"%d-bit OpenGL", vidsets[newvidset]&0x0ffff);
else
Bsprintf(tempbuf,"Software");
mgametext(c+168,50+16-8,tempbuf,MENUHIGHLIGHT(1),2+8+16); mgametext(c+168,50+16-8,tempbuf,MENUHIGHLIGHT(1),2+8+16);
menutext(c,50+16+16,MENUHIGHLIGHT(2),0,"FULLSCREEN"); menutext(c,50+16+16,MENUHIGHLIGHT(2),0,"FULLSCREEN");