1 files changed, 13 insertions, 29 deletions

diff --git a/tools/lldb-mi/MICmdArgContext.cpp b/tools/lldb-mi/MICmdArgContext.cpp
index 217913cff175..7a1bbf77d31a 100644
--- a/tools/lldb-mi/MICmdArgContext.cpp
+++ b/tools/lldb-mi/MICmdArgContext.cpp
@@ -7,18 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-//++
-// File:        MICmnArgContext.cpp
-//
-// Overview:    CMICmdArgContext implementation.
-//
-// Environment: Compilers:  Visual C++ 12.
-//                          gcc (Ubuntu/Linaro 4.8.1-10ubuntu9) 4.8.1
-//              Libraries:  See MIReadmetxt.
-//
-// Copyright:   None.
-//--
-
 // In-house headers:
 #include "MICmdArgContext.h"
 
@@ -30,8 +18,6 @@
 // Throws:  None.
 //--
 CMICmdArgContext::CMICmdArgContext(void)
-    : m_constCharSpace(' ')
-    , m_constStrSpace(" ")
 {
 }
 
@@ -44,8 +30,6 @@ CMICmdArgContext::CMICmdArgContext(void)
 //--
 CMICmdArgContext::CMICmdArgContext(const CMIUtilString &vrCmdLineArgsRaw)
     : m_strCmdArgsAndOptions(vrCmdLineArgsRaw)
-    , m_constCharSpace(' ')
-    , m_constStrSpace(" ")
 {
 }
 
@@ -101,35 +85,35 @@ CMICmdArgContext::RemoveArg(const CMIUtilString &vArg)
     if (vArg.empty())
         return MIstatus::success;
 
-    const MIuint nLen = vArg.length();
-    const MIuint nLenCntxt = m_strCmdArgsAndOptions.length();
+    const size_t nLen = vArg.length();
+    const size_t nLenCntxt = m_strCmdArgsAndOptions.length();
     if (nLen > nLenCntxt)
         return MIstatus::failure;
 
-    MIuint nExtraSpace = 0;
-    MIint nPos = m_strCmdArgsAndOptions.find(vArg);
+    size_t nExtraSpace = 0;
+    size_t nPos = m_strCmdArgsAndOptions.find(vArg);
     while (1)
     {
-        if (nPos == (MIint)std::string::npos)
+        if (nPos == std::string::npos)
             return MIstatus::success;
 
         bool bPass1 = false;
         if (nPos != 0)
         {
-            if (m_strCmdArgsAndOptions[nPos - 1] == m_constCharSpace)
+            if (m_strCmdArgsAndOptions[nPos - 1] == ' ')
                 bPass1 = true;
         }
         else
             bPass1 = true;
 
-        const MIuint nEnd = nPos + nLen;
+        const size_t nEnd = nPos + nLen;
 
         if (bPass1)
         {
             bool bPass2 = false;
             if (nEnd < nLenCntxt)
             {
-                if (m_strCmdArgsAndOptions[nEnd] == m_constCharSpace)
+                if (m_strCmdArgsAndOptions[nEnd] == ' ')
                 {
                     bPass2 = true;
                     nExtraSpace = 1;
@@ -145,7 +129,7 @@ CMICmdArgContext::RemoveArg(const CMIUtilString &vArg)
         nPos = m_strCmdArgsAndOptions.find(vArg, nEnd);
     }
 
-    const MIuint nPosEnd = nLen + nExtraSpace;
+    const size_t nPosEnd = nLen + nExtraSpace;
     m_strCmdArgsAndOptions = m_strCmdArgsAndOptions.replace(nPos, nPosEnd, "").c_str();
     m_strCmdArgsAndOptions = m_strCmdArgsAndOptions.Trim();
 
@@ -182,7 +166,7 @@ CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgInd
             // Single words
             strBuildContextUp += rWord;
             if (bSpaceRequired)
-                strBuildContextUp += m_constStrSpace;
+                strBuildContextUp += " ";
         }
         else
         {
@@ -193,7 +177,7 @@ CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgInd
                 while (vArg != words)
                 {
                     if (bSpaceRequired)
-                        words += m_constStrSpace;
+                        words += " ";
                     words += *it;
                     if (++it == itEnd)
                         break;
@@ -225,7 +209,7 @@ MIuint
 CMICmdArgContext::GetNumberArgsPresent(void) const
 {
     CMIUtilString::VecString_t vecOptions;
-    return m_strCmdArgsAndOptions.SplitConsiderQuotes(m_constStrSpace, vecOptions);
+    return m_strCmdArgsAndOptions.SplitConsiderQuotes(" ", vecOptions);
 }
 
 //++ ------------------------------------------------------------------------------------
@@ -239,7 +223,7 @@ CMIUtilString::VecString_t
 CMICmdArgContext::GetArgs(void) const
 {
     CMIUtilString::VecString_t vecOptions;
-    m_strCmdArgsAndOptions.SplitConsiderQuotes(m_constStrSpace, vecOptions);
+    m_strCmdArgsAndOptions.SplitConsiderQuotes(" ", vecOptions);
     return vecOptions;
 }