From 25243da03917b7e36a96a3d28bf99cb578501602 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 28 Jan 2016 22:25:46 +0900
Subject: mingw: Add formatLastError as wrapper function for FormatMessage

---
 src/SocketCore.cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/SocketCore.cc')

diff --git a/src/SocketCore.cc b/src/SocketCore.cc
index 8358527e..50e974f5 100644
--- a/src/SocketCore.cc
+++ b/src/SocketCore.cc
@@ -105,14 +105,13 @@ std::string errorMsg(int errNum)
 #ifndef __MINGW32__
   return util::safeStrerror(errNum);
 #else
-  static char buf[256];
-  if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                    nullptr, errNum,
-                    MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), (LPTSTR)&buf,
-                    sizeof(buf), nullptr) == 0) {
+  auto msg = util::formatLastError(errNum);
+  if (msg.empty()) {
+    char buf[256];
     snprintf(buf, sizeof(buf), EX_SOCKET_UNKNOWN_ERROR, errNum, errNum);
+    return buf;
   }
-  return buf;
+  return msg;
 #endif // __MINGW32__
 }
 } // namespace
-- 
cgit