From 075e2fa5c98e5a29a48f5ebc77bb6246b3b8a77a Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Thu, 6 Mar 2025 16:17:39 +0100
Subject: [PATCH] [debug] fix compile issues with WITH_DEBUG* builds

---
 client/SDL/SDL3/sdl_kbd.cpp       | 37 +++++++++++++++++++++++++++++++
 libfreerdp/codec/include/bitmap.h |  6 +----
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/client/SDL/SDL3/sdl_kbd.cpp b/client/SDL/SDL3/sdl_kbd.cpp
index 25f4a7965..1652511a4 100644
--- a/client/SDL/SDL3/sdl_kbd.cpp
+++ b/client/SDL/SDL3/sdl_kbd.cpp
@@ -395,6 +395,19 @@ uint32_t sdlInput::prefToMask()
 	return mod;
 }
 
+#if defined(WITH_DEBUG_SDL_KBD_EVENTS)
+static const char* sdl_scancode_name(Uint32 scancode)
+{
+	for (const auto& cur : map)
+	{
+		if (cur.sdl == scancode)
+			return cur.sdl_name;
+	}
+
+	return "SDL_SCANCODE_UNKNOWN";
+}
+#endif
+
 static Uint32 sdl_scancode_val(const char* scancodeName)
 {
 	for (const auto& cur : map)
@@ -406,6 +419,30 @@ static Uint32 sdl_scancode_val(const char* scancodeName)
 	return SDL_SCANCODE_UNKNOWN;
 }
 
+#if defined(WITH_DEBUG_SDL_KBD_EVENTS)
+static const char* sdl_rdp_scancode_name(UINT32 scancode)
+{
+	for (const auto& cur : map)
+	{
+		if (cur.rdp == scancode)
+			return cur.rdp_name;
+	}
+
+	return "RDP_SCANCODE_UNKNOWN";
+}
+#endif
+
+static UINT32 sdl_rdp_scancode_val(const char* scancodeName)
+{
+	for (const auto& cur : map)
+	{
+		if (strcmp(cur.rdp_name, scancodeName) == 0)
+			return cur.rdp;
+	}
+
+	return RDP_SCANCODE_UNKNOWN;
+}
+
 static UINT32 sdl_scancode_to_rdp(Uint32 scancode)
 {
 	UINT32 rdp = RDP_SCANCODE_UNKNOWN;
diff --git a/libfreerdp/codec/include/bitmap.h b/libfreerdp/codec/include/bitmap.h
index add8ec80b..6573933dd 100644
--- a/libfreerdp/codec/include/bitmap.h
+++ b/libfreerdp/codec/include/bitmap.h
@@ -99,9 +99,6 @@ static inline BOOL RLEDECOMPRESS(const BYTE* WINPR_RESTRICT pbSrcBuffer, UINT32
                                  BYTE* WINPR_RESTRICT pbDestBuffer, UINT32 rowDelta, UINT32 width,
                                  UINT32 height)
 {
-#if defined(WITH_DEBUG_CODECS)
-	char sbuffer[128] = { 0 };
-#endif
 	const BYTE* pbSrc = pbSrcBuffer;
 	BYTE* pbDest = pbDestBuffer;
 	PIXEL temp = 0;
@@ -152,8 +149,7 @@ static inline BOOL RLEDECOMPRESS(const BYTE* WINPR_RESTRICT pbSrcBuffer, UINT32
 		code = ExtractCodeId(*pbSrc);
 
 #if defined(WITH_DEBUG_CODECS)
-		WLog_VRB(TAG, "pbSrc=%p code=%s, rem=%" PRIuz, pbSrc,
-		         rle_code_str_buffer(code, sbuffer, sizeof(sbuffer)), pbEnd - pbSrc);
+		WLog_VRB(TAG, "pbSrc=%p code=%s, rem=%" PRIuz, pbSrc, rle_code_str(code), pbEnd - pbSrc);
 #endif
 
 		/* Handle Background Run Orders. */