diff options
| author |  Attila Molnar | 2014-07-25 12:05:40 +0200 |
|---|---|---|
| committer | Attila Molnar | 2014-07-25 12:05:40 +0200 |
| commit | f62654a6859998f9d63eb22702c572d5ebcff15c (patch) | |
| tree | fd38985a6a7f94658c157da9a6f470d718f34eed /src/socketengine.cpp | |
| parent | Update Windows build scripts for the recent build sys changes (diff) | |
| parent | Release v2.0.17 (diff) | |
Merge insp20
Diffstat (limited to 'src/socketengine.cpp')
| -rw-r--r-- | src/socketengine.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/socketengine.cpp b/src/socketengine.cpp index c6c520efc..1c91ccdea 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -291,7 +291,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 } |