1 files changed, 8 insertions, 20 deletions
diff --git a/tools/lldb-mi/MIUtilFileStd.cpp b/tools/lldb-mi/MIUtilFileStd.cpp
index dc5ea6cb32ff..a0fce65880c6 100644
--- a/tools/lldb-mi/MIUtilFileStd.cpp
+++ b/tools/lldb-mi/MIUtilFileStd.cpp
@@ -7,18 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-//++
-// File:        MIUtilFileStd.cpp
-//
-// Overview:    CMIUtilFileStd implementation.
-//
-// Environment: Compilers:  Visual C++ 12.
-//                          gcc (Ubuntu/Linaro 4.8.1-10ubuntu9) 4.8.1
-//              Libraries:  See MIReadmetxt.
-//
-// Copyright:   None.
-//--
-
 // Third party headers
 #include <stdio.h>
 #include <assert.h>
@@ -159,7 +147,7 @@ CMIUtilFileStd::Write(const CMIUtilString &vData)
 // Throws:  None.
 //--
 bool
-CMIUtilFileStd::Write(const MIchar *vpData, const MIuint vCharCnt)
+CMIUtilFileStd::Write(const char *vpData, const MIuint vCharCnt)
 {
     if (vCharCnt == 0)
         return MIstatus::success;
@@ -266,11 +254,11 @@ 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('/');
-    if ((nPos == (MIint)std::string::npos) && (nPos2 == (MIint)std::string::npos))
+    const size_t nPos = vDirectoryPath.rfind('\\');
+    size_t nPos2 = vDirectoryPath.rfind('/');
+    if ((nPos == std::string::npos) && (nPos2 == std::string::npos))
         return vDirectoryPath;
 
     if (nPos > nPos2)
@@ -281,14 +269,14 @@ CMIUtilFileStd::StripOffFileName(const CMIUtilString &vDirectoryPath) const
 }
 
 //++ ------------------------------------------------------------------------------------
-// Details: Return either backslash or forward slash appropriate to the OS this applilcation
+// Details: Return either backslash or forward slash appropriate to the OS this application
 //          is running on.
 // Type:    Static method.
 // Args:    None.
-// Return:  MIchar - '/' or '\' character.
+// Return:  char - '/' or '\' character.
 // Throws:  None.
 //--
-MIchar
+char
 CMIUtilFileStd::GetSlash(void)
 {
 #if !defined(_MSC_VER)