diff options
author | Arne Juul <arnej@verizonmedia.com> | 2020-07-02 12:33:51 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2020-07-03 08:02:39 +0000 |
commit | 8440cd09772a8fb8174915af9c4fb786dcf2cff0 (patch) | |
tree | 4acd4e37ea04f2e96fb50b0cf32dd8c305e3f6e5 | |
parent | 8ee299a551980d8e4a0b51ca7685c3a70a4bd2bd (diff) |
avoid naked exit
-rw-r--r-- | fbench/src/fbench/fbench.cpp | 3 | ||||
-rw-r--r-- | logd/src/tests/rotate/dummyserver.cpp | 3 | ||||
-rw-r--r-- | logforwarder/src/apps/vespa-logforwarder-start/child-handler.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/fbench/src/fbench/fbench.cpp b/fbench/src/fbench/fbench.cpp index 88d27a33bd7..efac34409cc 100644 --- a/fbench/src/fbench/fbench.cpp +++ b/fbench/src/fbench/fbench.cpp @@ -14,6 +14,7 @@ #include <cmath> #include <csignal> #include <cinttypes> +#include <cstdlib> namespace { @@ -327,7 +328,7 @@ FBench::Exit() StopClients(); printf("\n"); PrintSummary(); - exit(0); + std::_Exit(0); } int diff --git a/logd/src/tests/rotate/dummyserver.cpp b/logd/src/tests/rotate/dummyserver.cpp index 4a52154f37c..f3458edaf80 100644 --- a/logd/src/tests/rotate/dummyserver.cpp +++ b/logd/src/tests/rotate/dummyserver.cpp @@ -9,11 +9,12 @@ #include <time.h> #include <fcntl.h> #include <vespa/vespalib/net/socket_address.h> +#include <cstdlib> void error(const char *msg) { perror(msg); - exit(1); + std::_Exit(1); } int main(int /*argc*/, char ** /*argv*/) diff --git a/logforwarder/src/apps/vespa-logforwarder-start/child-handler.cpp b/logforwarder/src/apps/vespa-logforwarder-start/child-handler.cpp index c5c19aa2c3f..9a4fb5d1d29 100644 --- a/logforwarder/src/apps/vespa-logforwarder-start/child-handler.cpp +++ b/logforwarder/src/apps/vespa-logforwarder-start/child-handler.cpp @@ -8,6 +8,7 @@ #include <sys/wait.h> #include <vector> #include <string> +#include <cstdlib> #include <vespa/log/log.h> LOG_SETUP(".child-handler"); @@ -44,7 +45,7 @@ runSplunk(const vespalib::string &prefix, std::vector<const char *> args) execv(cargv[0], cargv); // if execv fails: perror(cargv[0]); - exit(1); + std::_Exit(1); } LOG(debug, "child running with pid %d", (int)child); int waitStatus = 0; |