From 33c08fc8aaf1ba5780a09d6ceaa2351abfd5e964 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 13 Dec 2022 13:34:44 +0000
Subject: Deduplicate retrieving error messages on Windows.

---
 src/socketengine.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/socketengine.cpp')

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 85f2ddd04..06b948248 100644
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -366,17 +366,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, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), NULL) == 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
 }
 
-- 
cgit v1.3.1-10-gc9f91