From c03e68c99637abe31651869acf2119c4c8b6a90e Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Fri, 14 May 2021 22:48:32 -0700
Subject: [PATCH] Debugger: Simplify symbol map filename build.

---
 Qt/QtHost.cpp           |  6 +-----
 UWP/UWPHost.cpp         | 25 ++++++++-----------------
 Windows/WindowsHost.cpp | 25 ++++++++-----------------
 3 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/Qt/QtHost.cpp b/Qt/QtHost.cpp
index e91a719012..02ed199734 100644
--- a/Qt/QtHost.cpp
+++ b/Qt/QtHost.cpp
@@ -19,9 +19,5 @@
 #include "Qt/QtHost.h"
 
 Path QtHost::SymbolMapFilename(Path currentFilename) {
-	std::string ext = currentFilename.GetFileExtension();
-	if (ext == "")
-		return currentFilename.WithExtraExtension("map");
-	else
-		return currentFilename.WithReplacedExtension(ext, "map");
+	return currentFilename.WithReplacedExtension(".map");
 }
diff --git a/UWP/UWPHost.cpp b/UWP/UWPHost.cpp
index 9282a9caf1..5e489e161c 100644
--- a/UWP/UWPHost.cpp
+++ b/UWP/UWPHost.cpp
@@ -121,36 +121,27 @@ void UWPHost::BootDone() {
 	Core_EnableStepping(false);
 }
 
-static Path SymbolMapFilename(const char *currentFilename, const char *ext) {
+static Path SymbolMapFilename(const Path &currentFilename, const char *ext) {
 	File::FileInfo info;
-
-	std::string result = currentFilename;
-
 	// can't fail, definitely exists if it gets this far
-	File::GetFileInfo(Path(currentFilename), &info);
+	File::GetFileInfo(currentFilename, &info);
 	if (info.isDirectory) {
-		return Path(result) / (std::string(".ppsspp-symbols") + ext);
-	} else {
-		size_t dot = result.rfind('.');
-		if (dot == result.npos)
-			return Path(result + ext);
-
-		result.replace(dot, result.npos, ext);
-		return Path(result);
+		return currentFilename / (std::string(".ppsspp-symbols") + ext);
 	}
+	return currentFilename.WithReplacedExtension(ext);
 }
 
 bool UWPHost::AttemptLoadSymbolMap() {
-	bool result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".ppmap"));
+	bool result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".ppmap"));
 	// Load the old-style map file.
 	if (!result1)
-		result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".map"));
-	bool result2 = g_symbolMap->LoadNocashSym(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".sym"));
+		result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".map"));
+	bool result2 = g_symbolMap->LoadNocashSym(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".sym"));
 	return result1 || result2;
 }
 
 void UWPHost::SaveSymbolMap() {
-	g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".ppmap"));
+	g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".ppmap"));
 }
 
 void UWPHost::NotifySymbolMapUpdated() {
diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp
index eae7edc830..610b79890b 100644
--- a/Windows/WindowsHost.cpp
+++ b/Windows/WindowsHost.cpp
@@ -268,39 +268,30 @@ void WindowsHost::BootDone() {
 	SetDebugMode(!g_Config.bAutoRun);
 }
 
-static Path SymbolMapFilename(const char *currentFilename, const char* ext) {
+static Path SymbolMapFilename(const Path &currentFilename, const char *ext) {
 	File::FileInfo info;
-
-	std::string result = currentFilename;
-
 	// can't fail, definitely exists if it gets this far
-	File::GetFileInfo(Path(currentFilename), &info);
+	File::GetFileInfo(currentFilename, &info);
 	if (info.isDirectory) {
-		return Path(result) / (std::string(".ppsspp-symbols") + ext);
-	} else {
-		const size_t dot = result.rfind('.');
-		if (dot == result.npos)
-			return Path(result + ext);
-
-		result.replace(dot, result.npos, ext);
-		return Path(result);
+		return currentFilename / (std::string(".ppsspp-symbols") + ext);
 	}
+	return currentFilename.WithReplacedExtension(ext);
 }
 
 bool WindowsHost::AttemptLoadSymbolMap() {
 	if (!g_symbolMap)
 		return false;
-	bool result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".ppmap"));
+	bool result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".ppmap"));
 	// Load the old-style map file.
 	if (!result1)
-		result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".map"));
-	bool result2 = g_symbolMap->LoadNocashSym(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".sym"));
+		result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".map"));
+	bool result2 = g_symbolMap->LoadNocashSym(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".sym"));
 	return result1 || result2;
 }
 
 void WindowsHost::SaveSymbolMap() {
 	if (g_symbolMap)
-		g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(),".ppmap"));
+		g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".ppmap"));
 }
 
 void WindowsHost::NotifySymbolMapUpdated() {