From: Gunnar Beutner <gunnar@beutner.name>
Date: Mon, 2 Mar 2015 11:41:02 +0000 (+0100)
Subject: Fix incorrect return type for Application::Run
X-Git-Tag: v2.3.0~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6ca140ee28d5b60f5bdcb3d28295a200b390753;p=icinga2

Fix incorrect return type for Application::Run
---

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index 22abf8b24..0f42c6abf 100644
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -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();
 }
 
 /**