1 files changed, 10 insertions, 10 deletions
diff --git a/CPP/7zip/UI/Console/MainAr.cpp b/CPP/7zip/UI/Console/MainAr.cpp
index b6681b4..0e5cebc 100755..100644
--- a/CPP/7zip/UI/Console/MainAr.cpp
+++ b/CPP/7zip/UI/Console/MainAr.cpp
@@ -2,11 +2,11 @@
 
 #include "StdAfx.h"
 
-#include "Common/MyException.h"
-#include "Common/StdOutStream.h"
+#include "../../../Common/MyException.h"
+#include "../../../Common/StdOutStream.h"
 
-#include "Windows/Error.h"
-#include "Windows/NtCheck.h"
+#include "../../../Windows/ErrorMsg.h"
+#include "../../../Windows/NtCheck.h"
 
 #include "../Common/ArchiveCommandLine.h"
 #include "../Common/ExitCode.h"
@@ -23,6 +23,7 @@ extern int Main2(
   #endif
 );
 
+static const char *kException_CmdLine_Error_Message = "\n\nCommand Line Error:\n";
 static const char *kExceptionErrorMessage = "\n\nError:\n";
 static const char *kUserBreak  = "\nBreak signaled\n";
 static const char *kMemoryExceptionMessage = "\n\nERROR: Can't allocate required memory!\n";
@@ -62,9 +63,9 @@ int MY_CDECL main
     (*g_StdStream) << endl << kUserBreak;
     return (NExitCode::kUserBreak);
   }
-  catch(const CArchiveCommandLineException &e)
+  catch(const CArcCmdLineException &e)
   {
-    (*g_StdStream) << kExceptionErrorMessage << e << endl;
+    (*g_StdStream) << kException_CmdLine_Error_Message << e << endl;
     return (NExitCode::kUserError);
   }
   catch(const CSystemException &systemError)
@@ -79,9 +80,8 @@ int MY_CDECL main
       (*g_StdStream) << endl << kUserBreak;
       return (NExitCode::kUserBreak);
     }
-    UString message;
-    NError::MyFormatMessage(systemError.ErrorCode, message);
-    (*g_StdStream) << endl << endl << "System error:" << endl << message << endl;
+    (*g_StdStream) << endl << endl << "System error:" << endl <<
+        NError::MyFormatMessage(systemError.ErrorCode) << endl;
     return (NExitCode::kFatalError);
   }
   catch(NExitCode::EEnum &exitCode)
@@ -121,5 +121,5 @@ int MY_CDECL main
     (*g_StdStream) << kUnknownExceptionMessage;
     return (NExitCode::kFatalError);
   }
-  return  res;
+  return res;
 }