diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-03-26 18:44:09 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-03-26 18:44:09 -0700 |
| commit | 3540cf26b1b342f175255f2dc02e615483a1383c (patch) | |
| tree | 0354221ec3360b4c4a8a77da1f692a6bfd501ba3 /src/system | |
| parent | cfa4524cb311024ede0675939d8a7f7a262d0d54 (diff) | |
replace exit and _exit with std variants
_exit and std::_Exit are identical, expect the latter is standard C++.
Added several functions to the std namespace as a result of headers.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'src/system')
| -rw-r--r-- | src/system/FatalError.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/system/FatalError.cxx b/src/system/FatalError.cxx index 0fc5df8b8..ee612994e 100644 --- a/src/system/FatalError.cxx +++ b/src/system/FatalError.cxx @@ -22,11 +22,9 @@ #include "LogV.hxx" #include <cstdarg> - -#include <unistd.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> #ifdef _WIN32 #include <windows.h> @@ -40,7 +38,7 @@ static constexpr Domain fatal_error_domain("fatal_error"); static void Abort() { - _exit(EXIT_FAILURE); + std::_Exit(EXIT_FAILURE); } void @@ -82,7 +80,7 @@ FatalSystemError(const char *msg) #ifdef _WIN32 FatalSystemError(msg, GetLastError()); #else - const char *system_error = strerror(errno); + auto system_error = std::strerror(errno); FormatError(fatal_error_domain, "%s: %s", msg, system_error); Abort(); #endif @@ -94,7 +92,7 @@ FormatFatalSystemError(const char *fmt, ...) char buffer[1024]; std::va_list ap; va_start(ap, fmt); - vsnprintf(buffer, sizeof(buffer), fmt, ap); + std::vsnprintf(buffer, sizeof(buffer), fmt, ap); va_end(ap); FatalSystemError(buffer); |