xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2026-02-01 00:24:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

9.34

Browse Source
This commit is contained in:
Igor Pavlov
2014-11-23 00:00:00 +00:00
committed by Kornel Lesiński
parent 83f8ddcc5b
commit f08f4dcc3c
1158 changed files with 76451 additions and 35082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CPP/7zip/UI/Console/MainAr.cpp
Executable → Regular
+9 -8
View File
@@ -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)
@@ -80,7 +81,7 @@ int MY_CDECL main
return (NExitCode::kUserBreak);
}
(*g_StdStream) << endl << endl << "System error:" << endl <<
NError::MyFormatMessageW(systemError.ErrorCode) << endl;
NError::MyFormatMessage(systemError.ErrorCode) << endl;
return (NExitCode::kFatalError);
}
catch(NExitCode::EEnum &exitCode)
@@ -120,5 +121,5 @@ int MY_CDECL main
(*g_StdStream) << kUnknownExceptionMessage;
return (NExitCode::kFatalError);
}
return res;
return res;
}