[Libreoffice-commits] online.git: loolwsd/LOOLForKit.cpp

[Ashod Nakashian]

 loolwsd/LOOLForKit.cpp |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 7399f82b4e6a5fe48634f99cf75591180fdcea7d
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Apr 17 19:00:55 2016 -0400

    loolwsd: std::exit -> std::_Exit in forkit
    
    Change-Id: I68af331440d95811f1d50c95de470350c0b6a4a3
    Reviewed-on: https://gerrit.libreoffice.org/24179
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index a12110a..ad2c6fe 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -161,7 +161,7 @@ static void printArgumentHelp()
 int main(int argc, char** argv)
 {
     if (!hasCorrectUID("loolforkit"))
-        return 1;
+        return Application::EXIT_SOFTWARE;
 
     if (std::getenv("SLEEPFORDEBUGGER"))
     {
@@ -181,7 +181,7 @@ int main(int argc, char** argv)
     if (signal(SIGCHLD, SIG_IGN) == SIG_ERR)
     {
         Log::syserror("Failed to set SIGCHLD to SIG_IGN.");
-        return 1;
+        return Application::EXIT_SOFTWARE;
     }
 
     std::string childRoot;
@@ -241,7 +241,7 @@ int main(int argc, char** argv)
         loTemplate.empty() || childRoot.empty())
     {
         printArgumentHelp();
-        return 1;
+        return Application::EXIT_USAGE;
     }
 
     if (!UnitBase::init(UnitBase::UnitType::TYPE_KIT,
@@ -262,13 +262,13 @@ int main(int argc, char** argv)
     if ( (pipeFd = open(pipeLoolwsd.c_str(), O_RDONLY) ) < 0 )
     {
         Log::syserror("Failed to open pipe [" + pipeLoolwsd + "] for reading. Exiting.");
-        std::exit(Application::EXIT_SOFTWARE);
+        std::_Exit(Application::EXIT_SOFTWARE);
     }
     Log::debug("open(" + pipeLoolwsd + ", RDONLY) = " + std::to_string(pipeFd));
 
     // Initialize LoKit
     if (!globalPreinit(loTemplate))
-        std::exit(Application::EXIT_SOFTWARE);
+        std::_Exit(Application::EXIT_SOFTWARE);
 
     Log::info("Preinit stage OK.");
 
@@ -276,7 +276,7 @@ int main(int argc, char** argv)
     if (createLibreOfficeKit(childRoot, sysTemplate, loTemplate, loSubPath) < 0)
     {
         Log::error("Failed to create a kit process.");
-        std::exit(Application::EXIT_SOFTWARE);
+        std::_Exit(Application::EXIT_SOFTWARE);
     }
 
     ChildDispatcher childDispatcher(pipeFd);