X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnotify.c;h=28cfe23b23c4d81ddeaee10ba4b07366fc44abd9;hb=3e21c85da365f66582d77eb0a81016c7f43c7762;hp=514636e47208ae310d67b3c174a6406251f6bcd1;hpb=2f02ce4005075ac76742ed6a2189cc2e5fc6a192;p=elogind.git diff --git a/src/notify.c b/src/notify.c index 514636e47..28cfe23b2 100644 --- a/src/notify.c +++ b/src/notify.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -131,12 +131,13 @@ int main(int argc, char* argv[]) { char* our_env[4], **final_env = NULL; unsigned i = 0; char *status = NULL, *cpid = NULL, *n = NULL; - int r, retval = 1; + int r, retval = EXIT_FAILURE; log_parse_environment(); + log_open(); if ((r = parse_argv(argc, argv)) <= 0) { - retval = r < 0; + retval = r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; goto finish; } @@ -172,7 +173,7 @@ int main(int argc, char* argv[]) { } if (strv_length(final_env) <= 0) { - retval = 0; + retval = EXIT_SUCCESS; goto finish; } @@ -186,7 +187,7 @@ int main(int argc, char* argv[]) { goto finish; } - retval = r <= 0; + retval = r <= 0 ? EXIT_FAILURE : EXIT_SUCCESS; finish: free(status);