summaryrefslogtreecommitdiff
path: root/src/setup/display.c
diff options
context:
space:
mode:
authorSimon Howard2014-04-01 20:56:33 -0400
committerSimon Howard2014-04-01 20:56:33 -0400
commit17c14e1fad6dc277a6e58e4f421d5c65e210d1fe (patch)
treefab7248ca23ce615c62222377a3ff5cab6bbeb73 /src/setup/display.c
parent8eb3200286d523379295143ce3f44d77ce036d4b (diff)
downloadchocolate-doom-17c14e1fad6dc277a6e58e4f421d5c65e210d1fe.tar.gz
chocolate-doom-17c14e1fad6dc277a6e58e4f421d5c65e210d1fe.tar.bz2
chocolate-doom-17c14e1fad6dc277a6e58e4f421d5c65e210d1fe.zip
setup: Eliminate use of sprintf().
Use M_snprintf() or M_StringJoin() instead where appropriate. This fixes #371.
Diffstat (limited to 'src/setup/display.c')
-rw-r--r--src/setup/display.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/setup/display.c b/src/setup/display.c
index 1c0f8ef4..da440fce 100644
--- a/src/setup/display.c
+++ b/src/setup/display.c
@@ -29,6 +29,7 @@
#include "textscreen.h"
#include "m_config.h"
+#include "m_misc.h"
#include "mode.h"
#include "display.h"
@@ -152,8 +153,7 @@ void SetDisplayDriver(void)
{
char *env_string;
- env_string = malloc(strlen(video_driver) + 30);
- sprintf(env_string, "SDL_VIDEODRIVER=%s", video_driver);
+ env_string = M_StringJoin("SDL_VIDEODRIVER=", video_driver, NULL);
putenv(env_string);
free(env_string);
}
@@ -487,7 +487,7 @@ static void GenerateModesTable(TXT_UNCAST_ARG(widget),
continue;
}
- sprintf(buf, "%ix%i", modes[i].w, modes[i].h);
+ M_snprintf(buf, sizeof(buf), "%ix%i", modes[i].w, modes[i].h);
rbutton = TXT_NewRadioButton(buf, &vidmode, i);
TXT_AddWidget(modes_table, rbutton);
TXT_SignalConnect(rbutton, "selected", ModeSelected, &modes[i]);