summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHafiz Abid Qadeer <hafiz_abid@mentor.com>2015-03-31 16:30:29 +0000
committerHafiz Abid Qadeer <hafiz_abid@mentor.com>2015-03-31 16:30:29 +0000
commit0e1f11ffe0afd0604bbee218ce74b915c732b678 (patch)
treec3c7b508ac4c03ec92f0caa63adb817a119e1a82
parent0b024619dfe4da40b6c8a7ef46bdc1815d11f7a7 (diff)
downloadbcm5719-llvm-0e1f11ffe0afd0604bbee218ce74b915c732b678.tar.gz
bcm5719-llvm-0e1f11ffe0afd0604bbee218ce74b915c732b678.zip
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
-rw-r--r--lldb/tools/lldb-mi/MICmdCmdFile.cpp2
-rw-r--r--lldb/tools/lldb-mi/MICmnLogMediumFile.cpp2
-rw-r--r--lldb/tools/lldb-mi/MIUtilFileStd.cpp2
-rw-r--r--lldb/tools/lldb-mi/MIUtilFileStd.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/lldb/tools/lldb-mi/MICmdCmdFile.cpp b/lldb/tools/lldb-mi/MICmdCmdFile.cpp
index 44438c32a7a..367d9789913 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<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 0fba2cfdbc9..f204263ec3f 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 5c16f18885c..bd2bb989df2 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 5386d3eb438..fb11174da56 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:
OpenPOWER on IntegriCloud