From fe5930c30dae5aa3e1ce05bf4681c27c8f65ca30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Wed, 27 Jul 2011 09:43:09 -0400
Subject: [PATCH] main() : simplify, return positive error codes
Conflicts:
sflphone-common/src/main.cpp
---
sflphone-common/src/main.cpp | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/sflphone-common/src/main.cpp b/sflphone-common/src/main.cpp
index 414ca35586..c0e22b0a6c 100644
--- a/sflphone-common/src/main.cpp
+++ b/sflphone-common/src/main.cpp
@@ -69,8 +69,6 @@ main (int argc, char **argv)
{
set_program_dir(argv[0]);
- int exit_code = 0;
-
Logger::setConsoleLog (false);
Logger::setDebugMode (false);
@@ -195,27 +193,20 @@ main (int argc, char **argv)
}
}
- bool initOK = false;
-
try {
// TODO Use $XDG_CONFIG_HOME to save the config file (which default to $HOME/.config)
Manager::instance().initConfigFile();
Manager::instance().init();
- initOK = true;
} catch (std::exception &e) {
std::cerr << e.what() << std::endl;
- exit_code = -1;
+ return 1;
} catch (...) {
fprintf (stderr, "An exception occured when initializing the system.");
- exit_code = -1;
- }
-
- if (initOK) {
- Manager::instance().setDBusManager (&DBusManager::instance());
- exit_code = DBusManager::instance().exec(); // UI Loop
+ return 1;
}
- return exit_code;
+ Manager::instance().setDBusManager (&DBusManager::instance());
+ return DBusManager::instance().exec(); // UI Loop
}
// EOF
--
GitLab