From dd9aec560688547dfd60090436d843c76450bd62 Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Mon, 27 Sep 2021 11:43:40 +0200 Subject: GetWindowsErrorAsString() -> GetSystemErrorAsString() --- zencore/except.cpp | 4 ++-- zencore/include/zencore/except.h | 2 +- zenhttp/httpsys.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zencore/except.cpp b/zencore/except.cpp index 44b8edffb..8614b52e1 100644 --- a/zencore/except.cpp +++ b/zencore/except.cpp @@ -72,11 +72,11 @@ ThrowSystemError(uint32_t ErrorCode, std::string_view Message) std::string GetLastErrorAsString() { - return GetWindowsErrorAsString(zen::GetLastError()); + return GetSystemErrorAsString(zen::GetLastError()); } std::string -GetWindowsErrorAsString(uint32_t Win32ErrorCode) +GetSystemErrorAsString(uint32_t Win32ErrorCode) { return std::error_code(Win32ErrorCode, std::system_category()).message(); } diff --git a/zencore/include/zencore/except.h b/zencore/include/zencore/except.h index 5cfefb1e2..3430565d2 100644 --- a/zencore/include/zencore/except.h +++ b/zencore/include/zencore/except.h @@ -27,7 +27,7 @@ ZENCORE_API void ThrowLastError [[noreturn]] (std::string_view Message, const st ZENCORE_API void ThrowSystemError [[noreturn]] (uint32_t ErrorCode, std::string_view Message); ZENCORE_API std::string GetLastErrorAsString(); -ZENCORE_API std::string GetWindowsErrorAsString(uint32_t Win32ErrorCode); +ZENCORE_API std::string GetSystemErrorAsString(uint32_t Win32ErrorCode); inline int32_t GetLastError() diff --git a/zenhttp/httpsys.cpp b/zenhttp/httpsys.cpp index 2a50388e3..b08e39a8a 100644 --- a/zenhttp/httpsys.cpp +++ b/zenhttp/httpsys.cpp @@ -417,7 +417,7 @@ HttpMessageResponseRequest::HandleCompletion(ULONG IoResult, ULONG_PTR NumberOfB if (IoResult != NO_ERROR) { - ZEN_WARN("response aborted due to error: '{}'", GetWindowsErrorAsString(IoResult)); + ZEN_WARN("response aborted due to error: '{}'", GetSystemErrorAsString(IoResult)); // if one transmit failed there's really no need to go on return nullptr; @@ -554,7 +554,7 @@ HttpMessageResponseRequest::IssueRequest(std::error_code& ErrorCode) CancelThreadpoolIo(Iocp); ZEN_ERROR("failed to send HTTP response (error: '{}'), request URL: '{}', request id: {}", - GetWindowsErrorAsString(SendResult), + GetSystemErrorAsString(SendResult), HttpReq->pRawUrl, HttpReq->RequestId); -- cgit v1.2.3