From ea1b3147b8064f8572844ac6a64e95aeb0b2acf0 Mon Sep 17 00:00:00 2001 From: bladeoner Date: Fri, 30 Nov 2018 12:38:02 +0100 Subject: [PATCH] Backport Remove ssnprintf function. Backport Remove ssnprintf function. from snes9x --- source/snes9x/controls.cpp | 12 ++++++------ source/snes9x/port.h | 8 -------- source/snes9x/snapshot.cpp | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/source/snes9x/controls.cpp b/source/snes9x/controls.cpp index be0245b..975c499 100644 --- a/source/snes9x/controls.cpp +++ b/source/snes9x/controls.cpp @@ -2468,11 +2468,11 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2) char drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], def[_MAX_FNAME + 1], ext[_MAX_EXT + 1]; _splitpath(Memory.ROMFilename, drive, dir, def, ext); - ssnprintf(filename, PATH_MAX + 1, "%s%s%s.%.*s", S9xGetDirectory(SNAPSHOT_DIR), SLASH_STR, def, _MAX_EXT - 1, "oops"); + snprintf(filename, PATH_MAX + 1, "%s%s%s.%.*s", S9xGetDirectory(SNAPSHOT_DIR), SLASH_STR, def, _MAX_EXT - 1, "oops"); if (S9xUnfreezeGame(filename)) { - ssnprintf(buf, 256, "%s.%.*s loaded", def, _MAX_EXT - 1, "oops"); + snprintf(buf, 256, "%s.%.*s loaded", def, _MAX_EXT - 1, "oops"); S9xSetInfoString (buf); } else @@ -2505,11 +2505,11 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2) char drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], def[_MAX_FNAME + 1], ext[_MAX_EXT + 1]; _splitpath(Memory.ROMFilename, drive, dir, def, ext); - ssnprintf(filename, PATH_MAX + 1, "%s%s%s.%03d", S9xGetDirectory(SNAPSHOT_DIR), SLASH_STR, def, i - QuickLoad000); + snprintf(filename, PATH_MAX + 1, "%s%s%s.%03d", S9xGetDirectory(SNAPSHOT_DIR), SLASH_STR, def, i - QuickLoad000); if (S9xUnfreezeGame(filename)) { - ssnprintf(buf, 256, "%s.%03d loaded", def, i - QuickLoad000); + snprintf(buf, 256, "%s.%03d loaded", def, i - QuickLoad000); S9xSetInfoString(buf); } else @@ -2534,9 +2534,9 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2) char drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], def[_MAX_FNAME + 1], ext[_MAX_EXT + 1]; _splitpath(Memory.ROMFilename, drive, dir, def, ext); - ssnprintf(filename, PATH_MAX + 1, "%s%s%s.%03d", S9xGetDirectory(SNAPSHOT_DIR), SLASH_STR, def, i - QuickSave000); + snprintf(filename, PATH_MAX + 1, "%s%s%s.%03d", S9xGetDirectory(SNAPSHOT_DIR), SLASH_STR, def, i - QuickSave000); - ssnprintf(buf, 256, "%s.%03d saved", def, i - QuickSave000); + snprintf(buf, 256, "%s.%03d saved", def, i - QuickSave000); S9xSetInfoString(buf); S9xFreezeGame(filename); diff --git a/source/snes9x/port.h b/source/snes9x/port.h index 5a07e1e..8caa885 100644 --- a/source/snes9x/port.h +++ b/source/snes9x/port.h @@ -335,14 +335,6 @@ void SetInfoDlgColor(unsigned char, unsigned char, unsigned char); #endif // __LIBRETRO__ #endif // __WIN32__ -inline void ssnprintf(char *dst, size_t size, const char *fmt, ...) -{ - va_list args; - va_start(args, fmt); - if (vsnprintf(dst, size, fmt, args) >= (int) size) - dst[size - 1] = '\0'; - va_end(args); -} inline void sstrncpy(char *dst, const char *src, size_t size) { strncpy(dst, src, size - 1); diff --git a/source/snes9x/snapshot.cpp b/source/snes9x/snapshot.cpp index 6bc6a8a..520f86d 100644 --- a/source/snes9x/snapshot.cpp +++ b/source/snes9x/snapshot.cpp @@ -1199,7 +1199,7 @@ void S9xResetSaveTimer (bool8 dontsave) char drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], def[_MAX_FNAME + 1], ext[_MAX_EXT + 1]; _splitpath(Memory.ROMFilename, drive, dir, def, ext); - ssnprintf(filename, PATH_MAX + 1, "%s%s%s.%.*s", S9xGetDirectory(SNAPSHOT_DIR), SLASH_STR, def, _MAX_EXT - 1, "oops"); + snprintf(filename, PATH_MAX + 1, "%s%s%s.%.*s", S9xGetDirectory(SNAPSHOT_DIR), SLASH_STR, def, _MAX_EXT - 1, "oops"); S9xMessage(S9X_INFO, S9X_FREEZE_FILE_INFO, SAVE_INFO_OOPS); S9xFreezeGame(filename); }