1 files changed, 16 insertions, 17 deletions

diff --git a/tools/lldb-mi/MIUtilString.h b/tools/lldb-mi/MIUtilString.h
index 7b188edefefa..23261605f3db 100644
--- a/tools/lldb-mi/MIUtilString.h
+++ b/tools/lldb-mi/MIUtilString.h
@@ -13,6 +13,7 @@
 #include <string>
 #include <vector>
 #include <cinttypes>
+#include <cstdarg>
 
 // In-house headers:
 #include "MIDataTypes.h"
@@ -20,9 +21,6 @@
 //++ ============================================================================
 // Details: MI common code utility class. Used to help handle text.
 //          Derived from std::string
-// Gotchas: None.
-// Authors: Illya Rudkin 02/02/2014.
-// Changes: None.
 //--
 class CMIUtilString : public std::string
 {
@@ -37,47 +35,48 @@ class CMIUtilString : public std::string
     static CMIUtilString FormatValist(const CMIUtilString &vrFormating, va_list vArgs);
     static bool IsAllValidAlphaAndNumeric(const char *vpText);
     static bool Compare(const CMIUtilString &vrLhs, const CMIUtilString &vrRhs);
-    static CMIUtilString ConvertToPrintableASCII(const char vChar);
-    static CMIUtilString ConvertToPrintableASCII(const char16_t vChar16);
-    static CMIUtilString ConvertToPrintableASCII(const char32_t vChar32);
+    static CMIUtilString ConvertToPrintableASCII(const char vChar, bool bEscapeQuotes = false);
+    static CMIUtilString ConvertToPrintableASCII(const char16_t vChar16, bool bEscapeQuotes = false);
+    static CMIUtilString ConvertToPrintableASCII(const char32_t vChar32, bool bEscapeQuotes = false);
 
     // Methods:
   public:
-    /* ctor */ CMIUtilString(void);
+    /* ctor */ CMIUtilString();
     /* ctor */ CMIUtilString(const char *vpData);
-    /* ctor */ CMIUtilString(const char *const *vpData);
+    /* ctor */ CMIUtilString(const std::string& vrStr);
     //
     bool ExtractNumber(MIint64 &vwrNumber) const;
     CMIUtilString FindAndReplace(const CMIUtilString &vFind, const CMIUtilString &vReplaceWith) const;
-    bool IsNumber(void) const;
-    bool IsHexadecimalNumber(void) const;
-    bool IsQuoted(void) const;
+    bool IsNumber() const;
+    bool IsHexadecimalNumber() const;
+    bool IsQuoted() const;
     CMIUtilString RemoveRepeatedCharacters(const char vChar);
     size_t Split(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const;
     size_t SplitConsiderQuotes(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const;
     size_t SplitLines(VecString_t &vwVecSplits) const;
-    CMIUtilString StripCREndOfLine(void) const;
-    CMIUtilString StripCRAll(void) const;
-    CMIUtilString Trim(void) const;
+    CMIUtilString StripCREndOfLine() const;
+    CMIUtilString StripCRAll() const;
+    CMIUtilString Trim() const;
     CMIUtilString Trim(const char vChar) const;
     size_t FindFirst(const CMIUtilString &vrPattern, size_t vnPos = 0) const;
     size_t FindFirst(const CMIUtilString &vrPattern, bool vbSkipQuotedText, bool &vrwbNotFoundClosedQuote,
                      size_t vnPos = 0) const;
     size_t FindFirstNot(const CMIUtilString &vrPattern, size_t vnPos = 0) const;
     CMIUtilString Escape(bool vbEscapeQuotes = false) const;
-    CMIUtilString AddSlashes(void) const;
-    CMIUtilString StripSlashes(void) const;
+    CMIUtilString AddSlashes() const;
+    CMIUtilString StripSlashes() const;
     //
     CMIUtilString &operator=(const char *vpRhs);
     CMIUtilString &operator=(const std::string &vrRhs);
 
     // Overrideable:
   public:
-    /* dtor */ virtual ~CMIUtilString(void);
+    /* dtor */ virtual ~CMIUtilString();
 
     // Static method:
   private:
     static CMIUtilString FormatPriv(const CMIUtilString &vrFormat, va_list vArgs);
+    static CMIUtilString ConvertCharValueToPrintableASCII(char vChar, bool bEscapeQuotes);
 
     // Methods:
   private: