diff options
author | William A. Kennington III <wak@google.com> | 2018-10-19 17:18:34 -0700 |
---|---|---|
committer | William A. Kennington III <wak@google.com> | 2018-10-19 17:26:03 -0700 |
commit | 3e781064f534ae0c822ac4c4f5590635633aa394 (patch) | |
tree | 675226520152cb0f58c1334a42ddfcec3c1d3c22 /control | |
parent | b884821df59d8f477d715f326caf74790647dede (diff) | |
download | phosphor-fan-presence-3e781064f534ae0c822ac4c4f5590635633aa394.tar.gz phosphor-fan-presence-3e781064f534ae0c822ac4c4f5590635633aa394.zip |
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>
Diffstat (limited to 'control')
-rw-r--r-- | control/argument.cpp | 2 | ||||
-rwxr-xr-x | control/gen-fan-zone-defs.py | 2 | ||||
-rw-r--r-- | control/main.cpp | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/control/argument.cpp b/control/argument.cpp index d9b832d..e014453 100644 --- a/control/argument.cpp +++ b/control/argument.cpp @@ -33,7 +33,7 @@ ArgumentParser::ArgumentParser(int argc, char** argv) if ((option == '?') || (option == 'h')) { usage(argv); - exit(-1); + exit(1); } auto i = &options[0]; diff --git a/control/gen-fan-zone-defs.py b/control/gen-fan-zone-defs.py index 644ce54..e5aa39b 100755 --- a/control/gen-fan-zone-defs.py +++ b/control/gen-fan-zone-defs.py @@ -600,7 +600,7 @@ if __name__ == '__main__': if not args.zone_yaml or not args.fan_yaml: parser.print_usage() - sys.exit(-1) + sys.exit(1) with open(args.zone_yaml, 'r') as zone_input: zone_data = yaml.safe_load(zone_input) or {} diff --git a/control/main.cpp b/control/main.cpp index 80a7df6..8c13cf9 100644 --- a/control/main.cpp +++ b/control/main.cpp @@ -32,7 +32,7 @@ int main(int argc, char* argv[]) if (argc != 2) { args.usage(argv); - exit(-1); + return 1; } Mode mode; @@ -48,7 +48,7 @@ int main(int argc, char* argv[]) else { args.usage(argv); - exit(-1); + return 1; } auto r = sd_event_default(&events); @@ -56,7 +56,7 @@ int main(int argc, char* argv[]) { log<level::ERR>("Failed call to sd_event_default()", entry("ERROR=%s", strerror(-r))); - return -1; + return 1; } phosphor::fan::event::EventPtr eventPtr{events}; @@ -86,7 +86,7 @@ int main(int argc, char* argv[]) } } //Log the useful metadata on these exceptions and let the app - //return -1 so it is restarted without a core dump. + //return 1 so it is restarted without a core dump. catch (phosphor::fan::util::DBusServiceError& e) { log<level::ERR>("Uncaught DBus service lookup failure exception", @@ -110,5 +110,5 @@ int main(int argc, char* argv[]) entry("PROPERTY=%s", e.property.c_str())); } - return -1; + return 1; } |