diff options
author | bunnei <bunneidev@gmail.com> | 2021-03-03 02:08:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-03 02:08:47 +0100 |
commit | f8bfec31095b8ccc7883dbff49472f6c0ce2dec8 (patch) | |
tree | 0c3fe3ba20f294d1fac2c89019204eec528c57f4 /src/common/misc.cpp | |
parent | Merge pull request #6020 from bunnei/shutdown-crash-2 (diff) | |
parent | [network] Error handling reform (diff) | |
download | yuzu-f8bfec31095b8ccc7883dbff49472f6c0ce2dec8.tar yuzu-f8bfec31095b8ccc7883dbff49472f6c0ce2dec8.tar.gz yuzu-f8bfec31095b8ccc7883dbff49472f6c0ce2dec8.tar.bz2 yuzu-f8bfec31095b8ccc7883dbff49472f6c0ce2dec8.tar.lz yuzu-f8bfec31095b8ccc7883dbff49472f6c0ce2dec8.tar.xz yuzu-f8bfec31095b8ccc7883dbff49472f6c0ce2dec8.tar.zst yuzu-f8bfec31095b8ccc7883dbff49472f6c0ce2dec8.zip |
Diffstat (limited to 'src/common/misc.cpp')
-rw-r--r-- | src/common/misc.cpp | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/src/common/misc.cpp b/src/common/misc.cpp index 1d5393597..495385b9e 100644 --- a/src/common/misc.cpp +++ b/src/common/misc.cpp @@ -12,27 +12,41 @@ #include "common/common_funcs.h" -// Generic function to get last error message. -// Call directly after the command or use the error num. -// This function might change the error code. -std::string GetLastErrorMsg() { - static constexpr std::size_t buff_size = 255; - char err_str[buff_size]; - +std::string NativeErrorToString(int e) { #ifdef _WIN32 - FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), err_str, buff_size, nullptr); - return std::string(err_str, buff_size); -#elif defined(__GLIBC__) && (_GNU_SOURCE || (_POSIX_C_SOURCE < 200112L && _XOPEN_SOURCE < 600)) + LPSTR err_str; + + DWORD res = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_IGNORE_INSERTS, + nullptr, e, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + reinterpret_cast<LPSTR>(&err_str), 1, nullptr); + if (!res) { + return "(FormatMessageA failed to format error)"; + } + std::string ret(err_str); + LocalFree(err_str); + return ret; +#else + char err_str[255]; +#if defined(__GLIBC__) && (_GNU_SOURCE || (_POSIX_C_SOURCE < 200112L && _XOPEN_SOURCE < 600)) // Thread safe (GNU-specific) - const char* str = strerror_r(errno, err_str, buff_size); + const char* str = strerror_r(e, err_str, sizeof(err_str)); return std::string(str); #else // Thread safe (XSI-compliant) - const int success = strerror_r(errno, err_str, buff_size); - if (success != 0) { - return {}; + int second_err = strerror_r(e, err_str, sizeof(err_str)); + if (second_err != 0) { + return "(strerror_r failed to format error)"; } return std::string(err_str); +#endif // GLIBC etc. +#endif // _WIN32 +} + +std::string GetLastErrorMsg() { +#ifdef _WIN32 + return NativeErrorToString(GetLastError()); +#else + return NativeErrorToString(errno); #endif } |