From c0e75f28214037e660e9c1a83dd5112f61ad63f7 Mon Sep 17 00:00:00 2001
From: Sintendo <3380580+Sintendo@users.noreply.github.com>
Date: Sat, 24 Jan 2026 17:38:54 +0100
Subject: [PATCH] Core/ConfigLoaders: Refactor GetGameIniFilenames

---
 .../Core/ConfigLoaders/GameConfigLoader.cpp    | 18 ++++++++----------
 .../Core/Core/ConfigLoaders/GameConfigLoader.h |  4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp
index a922a9ec38..d086d4d9db 100644
--- a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp
+++ b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp
@@ -3,13 +3,12 @@
 
 #include "Core/ConfigLoaders/GameConfigLoader.h"
 
-#include <algorithm>
 #include <array>
-#include <list>
 #include <map>
 #include <optional>
 #include <sstream>
 #include <string>
+#include <string_view>
 #include <tuple>
 #include <utility>
 #include <vector>
@@ -22,7 +21,6 @@
 #include "Common/IniFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/StringUtil.h"
 
 #include "Core/Config/MainSettings.h"
 #include "Core/Config/SYSCONFSettings.h"
@@ -32,7 +30,7 @@
 namespace ConfigLoaders
 {
 // Returns all possible filenames in ascending order of priority
-std::vector<std::string> GetGameIniFilenames(const std::string& id, std::optional<u16> revision)
+std::vector<std::string> GetGameIniFilenames(std::string_view id, std::optional<u16> revision)
 {
   std::vector<std::string> filenames;
 
@@ -44,18 +42,18 @@ std::vector<std::string> GetGameIniFilenames(const std::string& id, std::optiona
   if (id.length() == 6)
   {
     // INIs that match the system code (unique for each Virtual Console system)
-    filenames.push_back(id.substr(0, 1) + ".ini");
+    filenames.push_back(fmt::format("{}.ini", id.substr(0, 1)));
 
     // INIs that match all regions
-    filenames.push_back(id.substr(0, 3) + ".ini");
+    filenames.push_back(fmt::format("{}.ini", id.substr(0, 3)));
   }
 
   // Regular INIs
-  filenames.push_back(id + ".ini");
+  filenames.push_back(fmt::format("{}.ini", id));
 
   // INIs with specific revisions
   if (revision)
-    filenames.push_back(id + fmt::format("r{}", *revision) + ".ini");
+    filenames.push_back(fmt::format("{}r{}.ini", id, *revision));
 
   return filenames;
 }
@@ -313,7 +311,7 @@ void INIGameConfigLayerLoader::Save(Config::Layer* layer)
 
   // Try to save to the revision specific INI first, if it exists.
   const std::string gameini_with_rev =
-      File::GetUserPath(D_GAMESETTINGS_IDX) + m_id + fmt::format("r{}", m_revision) + ".ini";
+      fmt::format("{}{}r{}.ini", File::GetUserPath(D_GAMESETTINGS_IDX), m_id, m_revision);
   if (File::Exists(gameini_with_rev))
   {
     ini.Save(gameini_with_rev);
@@ -322,7 +320,7 @@ void INIGameConfigLayerLoader::Save(Config::Layer* layer)
 
   // Otherwise, save to the game INI. We don't try any INI broader than that because it will
   // likely cause issues with cheat codes and game patches.
-  const std::string gameini = File::GetUserPath(D_GAMESETTINGS_IDX) + m_id + ".ini";
+  const std::string gameini = fmt::format("{}{}.ini", File::GetUserPath(D_GAMESETTINGS_IDX), m_id);
   ini.Save(gameini);
 }
 
diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.h b/Source/Core/Core/ConfigLoaders/GameConfigLoader.h
index 78f849b4fe..b907fe2836 100644
--- a/Source/Core/Core/ConfigLoaders/GameConfigLoader.h
+++ b/Source/Core/Core/ConfigLoaders/GameConfigLoader.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <cstring>
 #include <memory>
 #include <optional>
 #include <string>
+#include <string_view>
 #include <vector>
 
 #include "Common/CommonTypes.h"
@@ -18,7 +18,7 @@ class ConfigLayerLoader;
 
 namespace ConfigLoaders
 {
-std::vector<std::string> GetGameIniFilenames(const std::string& id, std::optional<u16> revision);
+std::vector<std::string> GetGameIniFilenames(std::string_view id, std::optional<u16> revision);
 
 std::unique_ptr<Config::ConfigLayerLoader> GenerateGlobalGameConfigLoader(const std::string& id,
                                                                           u16 revision);