From 3e781064f534ae0c822ac4c4f5590635633aa394 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <wak@google.com>
Date: Fri, 19 Oct 2018 17:18:34 -0700
Subject: Fix exit status codes

Using an exit status of -1 everywhere leads to the status being
converted to 255 when output to a calling application. While this does
signify an error it has a reserved meaning for exit status out of range.
Lets use a valid general exit status of 1 instead.

Change-Id: I326701c78985e34c430c258fe31d9e910da10405
Signed-off-by: William A. Kennington III <wak@google.com>
---
 cooling-type/argument.cpp | 2 +-
 cooling-type/main.cpp     | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'cooling-type')

diff --git a/cooling-type/argument.cpp b/cooling-type/argument.cpp
index 2c9a580..2c54f75 100644
--- a/cooling-type/argument.cpp
+++ b/cooling-type/argument.cpp
@@ -34,7 +34,7 @@ ArgumentParser::ArgumentParser(int argc, char** argv)
         if ((option == '?') || (option == 'h'))
         {
             usage(argv);
-            exit(-1);
+            exit(1);
         }
 
         auto i = &options[0];
diff --git a/cooling-type/main.cpp b/cooling-type/main.cpp
index f690f80..3aa7d28 100644
--- a/cooling-type/main.cpp
+++ b/cooling-type/main.cpp
@@ -12,7 +12,7 @@ using namespace phosphor::logging;
 
 int main(int argc, char* argv[])
 {
-    auto rc = -1;
+    auto rc = 1;
     auto options = ArgumentParser(argc, argv);
 
     auto objpath = (options)["path"];
@@ -57,7 +57,7 @@ int main(int argc, char* argv[])
                 else
                 {
                     log<level::ERR>("--event=<keycode> argument required\n");
-                    exit(-1);
+                    return rc;
                 }
             }
 
@@ -66,7 +66,6 @@ int main(int argc, char* argv[])
         }
         catch (DBusMethodError& dme)
         {
-            rc = -1;
             log<level::ERR>("Uncaught DBus method failure exception",
                     entry("BUSNAME=%s", dme.busName.c_str()),
                     entry("PATH=%s", dme.path.c_str()),
@@ -75,7 +74,6 @@ int main(int argc, char* argv[])
         }
         catch (std::exception& err)
         {
-            rc = -1;
             log<phosphor::logging::level::ERR>(err.what());
         }
 
-- 
cgit v1.2.1