]> granicus.if.org Git - icinga2/commitdiff
Fix incorrect return type for Application::Run
authorGunnar Beutner <gunnar@beutner.name>
Mon, 2 Mar 2015 11:41:02 +0000 (12:41 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Mon, 2 Mar 2015 11:41:44 +0000 (12:41 +0100)
lib/base/application.cpp

index 22abf8b24c99c031fdf4538cefe2de01d5013e0f..0f42c6abfb9a618a1f4f2c3721d182f11ac5a90a 100644 (file)
@@ -689,8 +689,6 @@ void Application::InstallExceptionHandlers(void)
  */
 int Application::Run(void)
 {
-       int result;
-
 #ifndef _WIN32
        struct sigaction sa;
        memset(&sa, 0, sizeof(sa));
@@ -712,12 +710,10 @@ int Application::Run(void)
        } catch (const std::exception&) {
                Log(LogCritical, "Application")
                    << "Cannot update PID file '" << GetPidPath() << "'. Aborting.";
-               return false;
+               return EXIT_FAILURE;
        }
 
-       result = Main();
-
-       return result;
+       return Main();
 }
 
 /**