Blame SOURCES/0001-do-not-let-main-throw.patch
|
|
3ccdab |
From da5d99c57ecdf54b40c248a109969021b70f5a38 Mon Sep 17 00:00:00 2001
|
|
|
3ccdab |
From: David Tardon <dtardon@redhat.com>
|
|
|
3ccdab |
Date: Mon, 4 May 2015 17:49:37 +0200
|
|
|
3ccdab |
Subject: [PATCH] do not let main() throw
|
|
|
3ccdab |
|
|
|
3ccdab |
---
|
|
|
3ccdab |
src/orcus_detect_main.cpp | 18 ++++++++----------
|
|
|
3ccdab |
1 file changed, 8 insertions(+), 10 deletions(-)
|
|
|
3ccdab |
|
|
|
3ccdab |
diff --git a/src/orcus_detect_main.cpp b/src/orcus_detect_main.cpp
|
|
|
3ccdab |
index 2a9f082..2f4110f 100644
|
|
|
3ccdab |
--- a/src/orcus_detect_main.cpp
|
|
|
3ccdab |
+++ b/src/orcus_detect_main.cpp
|
|
|
3ccdab |
@@ -16,22 +16,14 @@
|
|
|
3ccdab |
using namespace orcus;
|
|
|
3ccdab |
using namespace std;
|
|
|
3ccdab |
|
|
|
3ccdab |
-int main(int argc, char** argv)
|
|
|
3ccdab |
+int main(int argc, char** argv) try
|
|
|
3ccdab |
{
|
|
|
3ccdab |
if (argc != 2)
|
|
|
3ccdab |
return EXIT_FAILURE;
|
|
|
3ccdab |
|
|
|
3ccdab |
const char* filepath = argv[1];
|
|
|
3ccdab |
string strm;
|
|
|
3ccdab |
- try
|
|
|
3ccdab |
- {
|
|
|
3ccdab |
- load_file_content(filepath, strm);
|
|
|
3ccdab |
- }
|
|
|
3ccdab |
- catch (const general_error& e)
|
|
|
3ccdab |
- {
|
|
|
3ccdab |
- cerr << e.what() << endl;
|
|
|
3ccdab |
- return EXIT_FAILURE;
|
|
|
3ccdab |
- }
|
|
|
3ccdab |
+ load_file_content(filepath, strm);
|
|
|
3ccdab |
|
|
|
3ccdab |
if (strm.empty())
|
|
|
3ccdab |
{
|
|
|
3ccdab |
@@ -67,4 +59,10 @@ int main(int argc, char** argv)
|
|
|
3ccdab |
|
|
|
3ccdab |
return EXIT_SUCCESS;
|
|
|
3ccdab |
}
|
|
|
3ccdab |
+catch (const general_error& e)
|
|
|
3ccdab |
+{
|
|
|
3ccdab |
+ cerr << e.what() << endl;
|
|
|
3ccdab |
+ return EXIT_FAILURE;
|
|
|
3ccdab |
+}
|
|
|
3ccdab |
+
|
|
|
3ccdab |
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
|
3ccdab |
--
|
|
|
3ccdab |
2.3.5
|
|
|
3ccdab |
|