diff options
| author |  Sadie Powell | 2022-12-25 22:28:12 +0000 |
|---|---|---|
| committer | Sadie Powell | 2022-12-25 22:44:50 +0000 |
| commit | 05168e354992d688d24a902787f4c51433ad7ef3 (patch) | |
| tree | d82629266081635e8f62e48e966ec8ebd73de2d8 /src/socketengine.cpp | |
| parent | Refactor SocketEngine slightly. (diff) | |
| parent | Update the Windows dependencies. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/socketengine.cpp')
| -rw-r--r-- | src/socketengine.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/socketengine.cpp b/src/socketengine.cpp index a256ae612..36e599834 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -350,17 +350,10 @@ std::string SocketEngine::LastError() #ifndef _WIN32 return strerror(errno); #else - char szErrorString[500]; - DWORD dwErrorCode = WSAGetLastError(); - if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), nullptr) == 0) - sprintf_s(szErrorString, _countof(szErrorString), "Error code: %u", dwErrorCode); - - std::string::size_type p; - std::string ret = szErrorString; - while ((p = ret.find_last_of("\r\n")) != std::string::npos) - ret.erase(p, 1); - - return ret; + std::string err = GetErrorMessage(WSAGetLastError()); + for (size_t pos = 0; ((pos = err.find_first_of("\r\n", pos)) != std::string::npos); ) + err[pos] = ' '; + return err; #endif } |