From 312ba58ffa6c63e5b7c6966c102765ec41986d8d Mon Sep 17 00:00:00 2001
From: jerrrrycho <jurek.pakula@gmail.com>
Date: Sat, 10 Oct 2026 17:44:12 +0200
Subject: [PATCH] refactor(sonar): format UUIDs and log timestamps with
 std::format (cpp:S6494, cpp:S5945)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 utilities/Logs.cpp      | 11 ++++-------
 utilities/utilities.cpp | 17 +++++++----------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp
index d3d447a1..e9d3035e 100644
--- a/utilities/Logs.cpp
+++ b/utilities/Logs.cpp
@@ -10,6 +10,8 @@ http://mozilla.org/MPL/2.0/.
 #include "stdafx.h"
 #include "utilities/Logs.h"
 
+#include <format>
+
 #include "utilities/Globals.h"
 #include "winheaders.h"
 #include "utilities/utilities.h"
@@ -19,7 +21,6 @@ http://mozilla.org/MPL/2.0/.
 std::ofstream output; // standardowy "log.txt", można go wyłączyć
 std::ofstream errors; // lista błędów "errors.txt", zawsze działa
 std::ofstream comms; // lista komunikatow "comms.txt", można go wyłączyć
-char logbuffer[ 256 ];
 
 char const endstring[10] = "\n";
 
@@ -45,18 +46,14 @@ std::string filename_date() {
     ::GetLocalTime( &st );
 #endif
 
-    std::snprintf(
-        logbuffer,
-        sizeof(logbuffer),
-	    "%d%02d%02d_%02d%02d%03d",
+    return std::format(
+	    "{}{:02}{:02}_{:02}{:02}{:03}",
         st.wYear,
         st.wMonth,
         st.wDay,
         st.wHour,
 	    st.wMinute,
 	    st.wMilliseconds);
-
-    return std::string( logbuffer );
 }
 
 std::string filename_scenery() {
diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp
index 68725738..62f601bd 100644
--- a/utilities/utilities.cpp
+++ b/utilities/utilities.cpp
@@ -17,6 +17,7 @@ Copyright (C) 2007-2014 Maciej Cierniak
 //#include <sys/stat.h>
 #include <charconv>
 #include <ranges>
+#include <format>
 //#ifndef WIN32
 //#include <unistd.h>
 //#endif
@@ -188,16 +189,12 @@ std::string generate_uuid_v4()
 	bytes[6] = bytes[6] & 0x0F | 0x40;
 	bytes[8] = bytes[8] & 0x3F | 0x80;
 
-	char buf[37]; // 36 znaków + \0
-	std::snprintf(buf, sizeof(buf),
-	              "%02x%02x%02x%02x-"
-	              "%02x%02x-"
-	              "%02x%02x-"
-	              "%02x%02x-"
-	              "%02x%02x%02x%02x%02x%02x",
-	              bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7], bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15]);
-
-	return std::string(buf);
+	return std::format("{:02x}{:02x}{:02x}{:02x}-"
+	                   "{:02x}{:02x}-"
+	                   "{:02x}{:02x}-"
+	                   "{:02x}{:02x}-"
+	                   "{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}",
+	                   bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7], bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15]);
 }
 
 double LocalRandom(double a, double b)