diff options
author | Arne Juul <arnej@verizonmedia.com> | 2020-07-02 12:31:52 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2020-07-03 08:02:39 +0000 |
commit | 875d8aa475cfbd0b7cb874bac21a9e042fdc1877 (patch) | |
tree | 9d8c8e53a0f4193a5f11e6a287aeb6e2fd67fb53 /configutil/src | |
parent | 6cd62c06b215ebd785fded2c5afb42a0df8be104 (diff) |
avoid naked exit
Diffstat (limited to 'configutil/src')
-rw-r--r-- | configutil/src/apps/configstatus/main.cpp | 7 | ||||
-rw-r--r-- | configutil/src/apps/modelinspect/main.cpp | 7 | ||||
-rw-r--r-- | configutil/src/lib/configstatus.cpp | 3 | ||||
-rw-r--r-- | configutil/src/lib/modelinspect.cpp | 3 |
4 files changed, 12 insertions, 8 deletions
diff --git a/configutil/src/apps/configstatus/main.cpp b/configutil/src/apps/configstatus/main.cpp index d1159a5e33c..befd0e649f6 100644 --- a/configutil/src/apps/configstatus/main.cpp +++ b/configutil/src/apps/configstatus/main.cpp @@ -3,7 +3,8 @@ #include <vespa/defaults.h> #include <vespa/vespalib/text/stringtokenizer.h> #include <iostream> -#include <lib/configstatus.h> +#include <cstdlib> +#include "lib/configstatus.h" #include <vespa/fastos/app.h> #include <vespa/log/log.h> @@ -48,13 +49,13 @@ int Application::parseOpts() { break; case 'h': usage(); - exit(0); + std::_Exit(0); case 'f': _flags.host_filter = parse_host_set(optArg); break; default: usage(); - exit(1); + std::_Exit(1); } } if (_specString.empty()) { diff --git a/configutil/src/apps/modelinspect/main.cpp b/configutil/src/apps/modelinspect/main.cpp index 0404cf0ae86..c43294be8de 100644 --- a/configutil/src/apps/modelinspect/main.cpp +++ b/configutil/src/apps/modelinspect/main.cpp @@ -2,7 +2,8 @@ #include <vespa/defaults.h> #include <iostream> -#include <lib/modelinspect.h> +#include <cstdlib> +#include "lib/modelinspect.h" #include <vespa/vespalib/text/stringtokenizer.h> #include <vespa/fastos/app.h> @@ -56,7 +57,7 @@ Application::parseOpts() return _argc; default: usage(); - exit(1); + std::_Exit(1); } } if (_specString.empty()) { @@ -84,7 +85,7 @@ Application::getConfigUri() } catch (std::exception &e) { std::cerr << "FATAL ERROR: failed to set up model configuration: " << e.what() << "\n"; - exit(1); + std::_Exit(1); } } diff --git a/configutil/src/lib/configstatus.cpp b/configutil/src/lib/configstatus.cpp index 1831a39b18a..415edf6defc 100644 --- a/configutil/src/lib/configstatus.cpp +++ b/configutil/src/lib/configstatus.cpp @@ -9,6 +9,7 @@ #include <vbench/http/http_client.h> #include <vespa/config/common/exceptions.h> #include <iostream> +#include <cstdlib> using configdefinitions::tagsContain; @@ -129,7 +130,7 @@ ConfigStatus::ConfigStatus(Flags flags, const config::ConfigUri uri) if (_cfg.get() == NULL) { std::cerr << "FATAL ERROR: failed to get model configuration." << std::endl; - exit(1); + std::_Exit(1); } } diff --git a/configutil/src/lib/modelinspect.cpp b/configutil/src/lib/modelinspect.cpp index bf0536a9d4c..db5709cc95b 100644 --- a/configutil/src/lib/modelinspect.cpp +++ b/configutil/src/lib/modelinspect.cpp @@ -6,6 +6,7 @@ #include <vespa/config/common/exceptions.h> #include <iostream> #include <algorithm> +#include <cstdlib> using configdefinitions::tagsContain; using configdefinitions::upcase; @@ -35,7 +36,7 @@ ModelInspect::ModelInspect(Flags flags, const config::ConfigUri uri, std::ostrea if (_flags.verbose) std::cerr << "success!\n"; } else { std::cerr << "FATAL ERROR: failed to get model configuration.\n"; - exit(1); + std::_Exit(1); } } |