iox-eclipse-iceoryx#1755 Use platform log frontend in Windows error h…

…andling
elBoberido · Mar 11, 2024 · 2d8ab87 · 2d8ab87
1 parent d13ab20
commit 2d8ab87
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/iceoryx_platform/win/source/win32_errorHandling.cpp b/iceoryx_platform/win/source/win32_errorHandling.cpp
@@ -16,29 +16,34 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "iceoryx_platform/win32_errorHandling.hpp"
+#include "iceoryx_platform/logging.hpp"
 
+#include <cstdio>
 #include <iostream>
 #include <mutex>
 
 int __PrintLastErrorToConsole(const char* functionName, const char* file, const int line) noexcept
 {
-    static std::mutex coutMutex;
     constexpr uint64_t BUFFER_SIZE{2048u};
     int lastError = GetLastError();
     if (lastError != 0)
     {
         char buffer[BUFFER_SIZE];
-        FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+        sprintf(buffer, "< Win32API Error > [%d] ::: ", lastError);
+        size_t used_buffer_size = strlen(buffer);
+        constexpr size_t NULL_TERMINATOR_SIZE{1};
+        size_t remaining_buffer_size = BUFFER_SIZE - used_buffer_size - NULL_TERMINATOR_SIZE;
+
+        FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK,
                       NULL,
                       lastError,
                       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                      buffer,
-                      BUFFER_SIZE - 1,
+                      &buffer[used_buffer_size],
+                      remaining_buffer_size,
                       NULL);
 
-        coutMutex.lock();
-        fprintf(stderr, "< Win32API Error > %s:%d { %s } [ %d ] ::: %s", file, line, functionName, lastError, buffer);
-        coutMutex.unlock();
+        iox_platform_detail_log(
+            file, line, functionName, IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_ERROR, buffer);
     }
     return lastError;
 }