From b85f2c496e2ed6c1fcb20d0d6856474116a7629d Mon Sep 17 00:00:00 2001
From: James Benton <james.benton2@gmail.com>
Date: Tue, 29 Jan 2019 10:30:15 +0000
Subject: [PATCH] common/strutils: Remove old defines of snprintf and
 vsnprinft.

---
 src/common/strutils.h                                |  2 --
 src/libdebugui/src/debugui_window_memory.cpp         |  5 +++--
 .../src/cafe/libraries/nn_save/nn_save_path.cpp      | 12 ++++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/common/strutils.h b/src/common/strutils.h
index a0277c74..eea8729f 100644
--- a/src/common/strutils.h
+++ b/src/common/strutils.h
@@ -10,8 +10,6 @@
 #include <vector>
 
 #ifdef PLATFORM_WINDOWS
-   #define snprintf sprintf_s
-   #define vsnprintf vsprintf_s
    #define strdup _strdup
 #endif
 
diff --git a/src/libdebugui/src/debugui_window_memory.cpp b/src/libdebugui/src/debugui_window_memory.cpp
index cf53fa75..1c75d762 100644
--- a/src/libdebugui/src/debugui_window_memory.cpp
+++ b/src/libdebugui/src/debugui_window_memory.cpp
@@ -110,8 +110,9 @@ MemoryWindow::draw()
                ImGui::SetKeyboardFocusHere();
 
                uint32_t targetAddress = static_cast<uint32_t>(editAddress);
-               snprintf(addressInput, 32, "%08X", targetAddress);
-               snprintf(dataInput, 32, "%02X", mem::read<unsigned char>(targetAddress));
+               std::snprintf(addressInput, 32, "%08X", targetAddress);
+               std::snprintf(dataInput, 32, "%02X",
+                             mem::read<unsigned char>(targetAddress));
 
                mLastEditAddress = editAddress;
                newlyFocused = true;
diff --git a/src/libdecaf/src/cafe/libraries/nn_save/nn_save_path.cpp b/src/libdecaf/src/cafe/libraries/nn_save/nn_save_path.cpp
index 3f8de017..bdb62914 100644
--- a/src/libdecaf/src/cafe/libraries/nn_save/nn_save_path.cpp
+++ b/src/libdecaf/src/cafe/libraries/nn_save/nn_save_path.cpp
@@ -118,9 +118,9 @@ SAVEGetSharedDataTitlePath(uint64_t titleID,
 
    auto titleLo = static_cast<uint32_t>(titleID & 0xffffffff);
    auto titleHi = static_cast<uint32_t>(titleID >> 32);
-   auto result = snprintf(buffer.get(), bufferSize,
-                           "/vol/%s/sys/title/%08x/%08x/content/%s",
-                          storage, titleHi, titleLo, dir.get());
+   auto result = std::snprintf(buffer.get(), bufferSize,
+                               "/vol/%s/sys/title/%08x/%08x/content/%s",
+                               storage, titleHi, titleLo, dir.get());
 
    if (result < 0 || static_cast<uint32_t>(result) >= bufferSize) {
       return SaveStatus::FatalError;
@@ -154,9 +154,9 @@ SAVEGetSharedSaveDataPath(uint64_t titleID,
 
    auto titleLo = static_cast<uint32_t>(titleID & 0xffffffff);
    auto titleHi = static_cast<uint32_t>(titleID >> 32);
-   auto result = snprintf(buffer.get(), bufferSize,
-                          "/vol/%s/usr/save/%08x/%08x/content/%s",
-                          storage, titleHi, titleLo, dir.get());
+   auto result = std::snprintf(buffer.get(), bufferSize,
+                               "/vol/%s/usr/save/%08x/%08x/content/%s",
+                               storage, titleHi, titleLo, dir.get());
 
    if (result < 0 || static_cast<uint32_t>(result) >= bufferSize) {
       return SaveStatus::FatalError;