From 0e1f11ffe0afd0604bbee218ce74b915c732b678 Mon Sep 17 00:00:00 2001 From: Hafiz Abid Qadeer Date: Tue, 31 Mar 2015 16:30:29 +0000 Subject: [PATCH] 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 --- lldb/tools/lldb-mi/MICmdCmdFile.cpp | 2 +- lldb/tools/lldb-mi/MICmnLogMediumFile.cpp | 2 +- lldb/tools/lldb-mi/MIUtilFileStd.cpp | 2 +- lldb/tools/lldb-mi/MIUtilFileStd.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lldb/tools/lldb-mi/MICmdCmdFile.cpp b/lldb/tools/lldb-mi/MICmdCmdFile.cpp index 44438c32a7ac..367d9789913a 100644 --- 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(rStrKeyWkDir, strWkDir)) { - strWkDir = CMIUtilFileStd().StripOffFileName(strExeFilePath); + strWkDir = CMIUtilFileStd::StripOffFileName(strExeFilePath); if (!rSessionInfo.SharedDataAdd(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 0fba2cfdbc9c..f204263ec3f7 100644 --- 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 5c16f18885c5..bd2bb989df2b 100644 --- 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 5386d3eb4382..fb11174da560 100644 --- 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: