diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dynamic.cpp | 4 | ||||
| -rw-r--r-- | src/socketengine.cpp | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/dynamic.cpp b/src/dynamic.cpp index 1470dff0c..b17f13190 100644 --- a/src/dynamic.cpp +++ b/src/dynamic.cpp @@ -101,5 +101,9 @@ void DLLManager::RetrieveLastError() FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errmsg, 100, 0); SetLastError(ERROR_SUCCESS); err = errmsg; + + std::string::size_type p; + while ((p = err.find_last_of("\r\n")) != std::string::npos) + err.erase(p, 1); } #endif diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 8af598b06..4a9a2ef10 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -265,7 +265,13 @@ std::string SocketEngine::LastError() DWORD dwErrorCode = WSAGetLastError(); if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), NULL) == 0) sprintf_s(szErrorString, _countof(szErrorString), "Error code: %u", dwErrorCode); - return szErrorString; + + 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; #endif } |