Changed a function to static.

A temp object was being created to call StripOffFileName. This function
is not dependent on class members so I am making it static.
No regression on testsuite on Linux.

llvm-svn: 233703

diff --git a/lldb/tools/lldb-mi/MICmdCmdFile.cpp b/lldb/tools/lldb-mi/MICmdCmdFile.cpp
index 44438c32a7ac8c893a75adc51298db080e628705..367d9789913a4d9d9cdc1d560872e74c1a8160d0 100644 (file)
--- a/lldb/tools/lldb-mi/MICmdCmdFile.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdFile.cpp
@@ -114,7 +114,7 @@ CMICmdCmdFileExecAndSymbols::Execute(void)
     const CMIUtilString &rStrKeyWkDir(rSessionInfo.m_constStrSharedDataKeyWkDir);
     if (!rSessionInfo.SharedDataRetrieve<CMIUtilString>(rStrKeyWkDir, strWkDir))
     {
-        strWkDir = CMIUtilFileStd().StripOffFileName(strExeFilePath);
+        strWkDir = CMIUtilFileStd::StripOffFileName(strExeFilePath);
         if (!rSessionInfo.SharedDataAdd<CMIUtilString>(rStrKeyWkDir, strWkDir))
         {
             SetError(CMIUtilString::Format(MIRSRC(IDS_DBGSESSION_ERR_SHARED_DATA_ADD), m_cmdData.strMiCmd.c_str(), rStrKeyWkDir.c_str()));

diff --git a/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp b/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp
index 0fba2cfdbc9c0eedff6114581c4028643dd94ed6..f204263ec3f71f47cc349e7e6581b64184e7b64a 100644 (file)
--- a/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp
+++ b/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp
@@ -216,7 +216,7 @@ CMICmnLogMediumFile::FileFormFileNamePath(void)
     CMIUtilString strPathName;
     if (CMIUtilSystem().GetLogFilesPath(strPathName))
     {
-        const CMIUtilString strPath = CMIUtilFileStd().StripOffFileName(strPathName);
+        const CMIUtilString strPath = CMIUtilFileStd::StripOffFileName(strPathName);
 
 // ToDo: Review this LINUX log file quick fix so not hidden
 // AD:

diff --git a/lldb/tools/lldb-mi/MIUtilFileStd.cpp b/lldb/tools/lldb-mi/MIUtilFileStd.cpp
index 5c16f18885c5249623d954ed968f329dc06bc14a..bd2bb989df2b7ab0e54eb56fe8e4e289509113a0 100644 (file)
--- a/lldb/tools/lldb-mi/MIUtilFileStd.cpp
+++ b/lldb/tools/lldb-mi/MIUtilFileStd.cpp
@@ -254,7 +254,7 @@ CMIUtilFileStd::GetLineReturn(void) const
 // Throws:  None.
 //--
 CMIUtilString
-CMIUtilFileStd::StripOffFileName(const CMIUtilString &vDirectoryPath) const
+CMIUtilFileStd::StripOffFileName(const CMIUtilString &vDirectoryPath)
 {
     const MIint nPos = vDirectoryPath.rfind('\\');
     MIint nPos2 = vDirectoryPath.rfind('/');

diff --git a/lldb/tools/lldb-mi/MIUtilFileStd.h b/lldb/tools/lldb-mi/MIUtilFileStd.h
index 5386d3eb4382904abda50b6e83e655fbbd9fa5fa..fb11174da560efc7b78b054a5ee0ecc85ae0b2d7 100644 (file)
--- a/lldb/tools/lldb-mi/MIUtilFileStd.h
+++ b/lldb/tools/lldb-mi/MIUtilFileStd.h
@@ -36,7 +36,7 @@ class CMIUtilFileStd : public CMICmnBase
     bool IsOk(void) const;
     bool IsFileExist(const CMIUtilString &vFileNamePath) const;
     const CMIUtilString &GetLineReturn(void) const;
-    CMIUtilString StripOffFileName(const CMIUtilString &vDirectoryPath) const;
+    static CMIUtilString StripOffFileName(const CMIUtilString &vDirectoryPath);
 
     // Overridden:
   public: