From 1769b8ea0f36f13939b007f024ea53ec1d81debc Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Fri, 17 Apr 2015 17:19:24 +0200 Subject: [PATCH] use return to exit from main function --- client.c | 4 ++-- main.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client.c b/client.c index 7c7ac62..64eefb7 100644 --- a/client.c +++ b/client.c @@ -2729,11 +2729,11 @@ main(int argc, char **argv) family = IPADDR_INET6; } else if (!strcmp("-v", *argv) || !strcmp("--version",*argv)) { printf("chronyc (chrony) version %s (%s)\n", CHRONY_VERSION, CHRONYC_FEATURES); - exit(0); + return 0; } else if (!strncmp(*argv, "-", 1)) { fprintf(stderr, "Usage: %s [-h HOST] [-p PORT] [-n] [-4|-6] [-a] [-f FILE] [-m] [COMMAND]\n", progname); - exit(1); + return 1; } else { break; /* And process remainder of line as a command */ } diff --git a/main.c b/main.c index b5c5c3e..393b12e 100644 --- a/main.c +++ b/main.c @@ -387,7 +387,7 @@ int main } else if (!strcmp("-v", *argv) || !strcmp("--version",*argv)) { /* This write to the terminal is OK, it comes before we turn into a daemon */ printf("chronyd (chrony) version %s (%s)\n", CHRONY_VERSION, CHRONYD_FEATURES); - exit(0); + return 0; } else if (!strcmp("-n", *argv)) { nofork = 1; } else if (!strcmp("-d", *argv)) { @@ -409,7 +409,7 @@ int main } else if (!strcmp("-h", *argv) || !strcmp("--help", *argv)) { printf("Usage: %s [-4|-6] [-n|-d] [-q|-Q] [-r] [-R] [-s] [-f FILE|COMMAND...]\n", progname); - exit(0); + return 0; } else if (*argv[0] == '-') { LOG_FATAL(LOGF_Main, "Unrecognized command line option [%s]", *argv); } else { @@ -422,7 +422,7 @@ int main if (getuid() != 0) { /* This write to the terminal is OK, it comes before we turn into a daemon */ fprintf(stderr,"Not superuser\n"); - exit(1); + return 1; } /* Turn into a daemon */