From cf04e7d6afdf5dd2be4f0deb93b5b05f7b1728e6 Mon Sep 17 00:00:00 2001
From: Nikhil Narayana <nikhil.narayana@live.com>
Date: Mon, 30 May 2022 13:49:34 -0700
Subject: [PATCH] remove some leftover code

---
 Source/Core/Common/FileUtil.cpp               |  1 -
 Source/Core/Common/FileUtil.h                 |  1 -
 Source/Core/Core/Slippi/SlippiDirectCodes.cpp | 11 +++++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
index ba063010f3..3014e387cf 100644
--- a/Source/Core/Common/FileUtil.cpp
+++ b/Source/Core/Common/FileUtil.cpp
@@ -931,7 +931,6 @@ static void RebuildUserDirectories(unsigned int dir_index)
     s_user_paths[F_GCSRAM_IDX] = s_user_paths[D_GCUSER_IDX] + GC_SRAM;
     s_user_paths[F_WIISDCARD_IDX] = s_user_paths[D_WIIROOT_IDX] + DIR_SEP WII_SDCARD;
     s_user_paths[F_USERJSON_IDX] = s_user_paths[D_USER_IDX] + "user.json";
-    s_user_paths[F_DIRECTCODESJSON_IDX] = s_user_paths[D_USER_IDX] + "directcodes.json";
 
     s_user_paths[D_MEMORYWATCHER_IDX] = s_user_paths[D_USER_IDX] + MEMORYWATCHER_DIR DIR_SEP;
     s_user_paths[F_MEMORYWATCHERLOCATIONS_IDX] =
diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h
index d652dcb6d8..e4500a3406 100644
--- a/Source/Core/Common/FileUtil.h
+++ b/Source/Core/Common/FileUtil.h
@@ -73,7 +73,6 @@ enum
   F_MEMORYWATCHERSOCKET_IDX,
   F_WIISDCARD_IDX,
   F_USERJSON_IDX,
-  F_DIRECTCODESJSON_IDX,
   F_DUALSHOCKUDPCLIENTCONFIG_IDX,
   NUM_PATH_INDICES
 };
diff --git a/Source/Core/Core/Slippi/SlippiDirectCodes.cpp b/Source/Core/Core/Slippi/SlippiDirectCodes.cpp
index 6962efb3f2..e57736905e 100644
--- a/Source/Core/Core/Slippi/SlippiDirectCodes.cpp
+++ b/Source/Core/Core/Slippi/SlippiDirectCodes.cpp
@@ -6,6 +6,7 @@
 #endif
 
 #include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
@@ -42,7 +43,7 @@ void SlippiDirectCodes::ReadFile()
 {
   std::string directCodesFilePath = getCodesFilePath();
 
-  INFO_LOG(SLIPPI_ONLINE, "Looking for direct codes file at %s", directCodesFilePath.c_str());
+  INFO_LOG_FMT(SLIPPI_ONLINE, "Looking for direct codes file at {}", directCodesFilePath.c_str());
 
   if (!File::Exists(directCodesFilePath))
   {
@@ -53,7 +54,7 @@ void SlippiDirectCodes::ReadFile()
     }
     else
     {
-      WARN_LOG(SLIPPI_ONLINE, "Was unable to create %s", directCodesFilePath.c_str());
+      WARN_LOG_FMT(SLIPPI_ONLINE, "Was unable to create {}", directCodesFilePath.c_str());
     }
   }
 
@@ -65,7 +66,7 @@ void SlippiDirectCodes::ReadFile()
 
 void SlippiDirectCodes::AddOrUpdateCode(std::string code)
 {
-  WARN_LOG(SLIPPI_ONLINE, "Attempting to add or update direct code: %s", code.c_str());
+  WARN_LOG_FMT(SLIPPI_ONLINE, "Attempting to add or update direct code: {}", code.c_str());
 
   time_t curTime;
   time(&curTime);
@@ -139,7 +140,7 @@ std::string SlippiDirectCodes::get(int index)
     return directCodeInfos.at(index).connectCode;
   }
 
-  INFO_LOG(SLIPPI_ONLINE, "Out of bounds name entry index %d", index);
+  INFO_LOG_FMT(SLIPPI_ONLINE, "Out of bounds name entry index {}", index);
 
   return (index >= directCodeInfos.size()) ? "1" : "";
 }
@@ -174,8 +175,6 @@ void SlippiDirectCodes::WriteFile()
 
 std::string SlippiDirectCodes::getCodesFilePath()
 {
-  std::string fileName = m_fileName + ".json";
-
   // TODO: Move to User dir
 #if defined(__APPLE__)
   std::string directCodesPath =