summaryrefslogtreecommitdiffstats
path: root/vespalog
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2020-07-02 11:38:32 +0000
committerArne Juul <arnej@verizonmedia.com>2020-07-03 08:02:38 +0000
commit0094ae77f3c41e4547cf2c62c8c492b3b3f1be7a (patch)
tree41bea769b3367a2527ab90bd89c00e78b641cc48 /vespalog
parentb44f17a9195eaf819128b5be78e334d5fd8b4f2c (diff)
use return from main() for clean shutdown
Diffstat (limited to 'vespalog')
-rw-r--r--vespalog/src/logctl/logctl.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/vespalog/src/logctl/logctl.cpp b/vespalog/src/logctl/logctl.cpp
index 950b7929a50..14137a79687 100644
--- a/vespalog/src/logctl/logctl.cpp
+++ b/vespalog/src/logctl/logctl.cpp
@@ -132,7 +132,7 @@ main(int argc, char **argv)
break;
case 'h':
usage(argv[0]);
- exit(EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
}
@@ -154,17 +154,17 @@ main(int argc, char **argv)
services = findAllFiles(dir);
if (doOnlyFile) {
fprintf(stderr, "-f and -a options cannot be used at the same time\n");
- exit(EXIT_FAILURE);
+ return EXIT_FAILURE;
}
// No log control files exist
if (services.empty()) {
- exit(EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
} else {
if (optind >= argc) {
usage(argv[0]);
fprintf(stderr, "ERROR: Missing service argument!\n");
- exit(EXIT_FAILURE);
+ return EXIT_FAILURE;
}
char *service = strdup(argv[optind]);
++optind;
@@ -195,7 +195,7 @@ main(int argc, char **argv)
if (argc > optind) {
usage(argv[0]);
fprintf(stderr, "ERROR: Too many arguments!\n\n");
- exit(EXIT_FAILURE);
+ return EXIT_FAILURE;
}
bool hadFailure = false;
@@ -221,12 +221,12 @@ main(int argc, char **argv)
hadFailure = true;
}
}
- if (hadFailure) exit(EXIT_FAILURE);
+ if (hadFailure) return EXIT_FAILURE;
if (! hadSuccess) {
fprintf(stderr, "no logcontrol files updates\n");
- exit(EXIT_FAILURE);
+ return EXIT_FAILURE;
}
- exit(EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
static void