Move GetFileName() to platform.cpp

diff --git a/src/debug/netcoredbg/frames.cpp b/src/debug/netcoredbg/frames.cpp
index 94ec5f9..ff491b4 100644 (file)
--- a/src/debug/netcoredbg/frames.cpp
+++ b/src/debug/netcoredbg/frames.cpp
@@ -7,11 +7,11 @@
 #include <iomanip>
 
 #include "typeprinter.h"
+#include "platform.h"
 
 std::string EscapeMIValue(const std::string &str);
 
 HRESULT GetModuleId(ICorDebugModule *pModule, std::string &id);
-std::string GetFileName(const std::string &path);
 
 HRESULT GetFrameLocation(ICorDebugFrame *pFrame,
                          ULONG32 &ilOffset,

diff --git a/src/debug/netcoredbg/jmc.cpp b/src/debug/netcoredbg/jmc.cpp
index 2643f67..ecd6563 100644 (file)
--- a/src/debug/netcoredbg/jmc.cpp
+++ b/src/debug/netcoredbg/jmc.cpp
@@ -5,9 +5,7 @@
 #include <list>
 
 #include "typeprinter.h"
-
-std::string GetFileName(const std::string &path);
-
+#include "platform.h"
 
 static const char *g_nonUserCode = "System.Diagnostics.DebuggerNonUserCodeAttribute..ctor";
 

diff --git a/src/debug/netcoredbg/modules.cpp b/src/debug/netcoredbg/modules.cpp
index 57341f4..2b31778 100644 (file)
--- a/src/debug/netcoredbg/modules.cpp
+++ b/src/debug/netcoredbg/modules.cpp
@@ -248,12 +248,6 @@ HRESULT GetModuleId(ICorDebugModule *pModule, std::string &id)
     return S_OK;
 }
 
-std::string GetFileName(const std::string &path)
-{
-    std::size_t i = path.find_last_of("/\\");
-    return i == std::string::npos ? path : path.substr(i + 1);
-}
-
 HRESULT TryLoadModuleSymbols(ICorDebugModule *pModule,
                              std::string &id,
                              std::string &name,

diff --git a/src/debug/netcoredbg/platform.cpp b/src/debug/netcoredbg/platform.cpp
index ecd1116..de4dc56 100644 (file)
--- a/src/debug/netcoredbg/platform.cpp
+++ b/src/debug/netcoredbg/platform.cpp
@@ -28,6 +28,12 @@ unsigned long OSPageSize()
     return pageSize;
 }
 
+std::string GetFileName(const std::string &path)
+{
+    std::size_t i = path.find_last_of("/\\");
+    return i == std::string::npos ? path : path.substr(i + 1);
+}
+
 void AddFilesFromDirectoryToTpaList(const std::string &directory, std::string &tpaList)
 {
     const char * const tpaExtensions[] = {

diff --git a/src/debug/netcoredbg/platform.h b/src/debug/netcoredbg/platform.h
index a89c85b..9c2e86e 100644 (file)
--- a/src/debug/netcoredbg/platform.h
+++ b/src/debug/netcoredbg/platform.h
@@ -2,3 +2,4 @@ unsigned long OSPageSize();
 void AddFilesFromDirectoryToTpaList(const std::string &directory, std::string &tpaList);
 std::string GetExeAbsPath();
 std::string GetCoreCLRPath(int pid);
+std::string GetFileName(const std::string &path);