From 81526b19a2933e93d37d2007f4fe24e9df699123 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 3 Mar 2026 14:07:49 +0100 Subject: [PATCH] [string,format] fix format strings for debug messages --- channels/rdpei/client/rdpei_main.c | 2 +- libfreerdp/locale/keyboard_xkbfile.c | 2 +- winpr/libwinpr/sspi/NTLM/ntlm.c | 4 ++-- winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c | 3 ++- winpr/libwinpr/synch/event.c | 5 +++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c index f727b1eed..8213c63bb 100644 --- a/channels/rdpei/client/rdpei_main.c +++ b/channels/rdpei/client/rdpei_main.c @@ -239,7 +239,7 @@ static UINT rdpei_send_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s, UINT1 Stream_Buffer(s), nullptr); #ifdef WITH_DEBUG_RDPEI WLog_Print(rdpei->base.log, WLOG_DEBUG, - "rdpei_send_pdu: eventId: %" PRIu16 " (%s) length: %" PRIu32 " status: %" PRIu32 "", + "rdpei_send_pdu: eventId: %" PRIu16 " (%s) length: %" PRIuz " status: %" PRIu32 "", eventId, rdpei_eventid_string(eventId), pduLength, status); #endif return status; diff --git a/libfreerdp/locale/keyboard_xkbfile.c b/libfreerdp/locale/keyboard_xkbfile.c index 453208996..73cc42f10 100644 --- a/libfreerdp/locale/keyboard_xkbfile.c +++ b/libfreerdp/locale/keyboard_xkbfile.c @@ -498,7 +498,7 @@ int freerdp_keyboard_load_map_from_xkbfile(void* display, DWORD* x11_keycode_to_ if (!found) { - DEBUG_KBD("%4s: keycode: 0x%02X -> no RDP scancode found", xkb_keyname, i); + DEBUG_KBD("%4s: keycode: 0x%02" PRIxz " -> no RDP scancode found", xkb_keyname, i); } else status = 0; diff --git a/winpr/libwinpr/sspi/NTLM/ntlm.c b/winpr/libwinpr/sspi/NTLM/ntlm.c index 9f73343f0..2aa9c95a2 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm.c @@ -1170,7 +1170,7 @@ hmac_fail: } #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "Data Buffer (length = %" PRIuz ")", length); + WLog_DBG(TAG, "Data Buffer (length = %" PRIu32 ")", length); winpr_HexDump(TAG, WLOG_DEBUG, data, length); WLog_DBG(TAG, "Encrypted Data Buffer (length = %" PRIu32 ")", data_buffer->cbBuffer); winpr_HexDump(TAG, WLOG_DEBUG, data_buffer->pvBuffer, data_buffer->cbBuffer); @@ -1279,7 +1279,7 @@ hmac_fail: } #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "Encrypted Data Buffer (length = %" PRIuz ")", length); + WLog_DBG(TAG, "Encrypted Data Buffer (length = %" PRIu32 ")", length); winpr_HexDump(TAG, WLOG_DEBUG, data, length); WLog_DBG(TAG, "Data Buffer (length = %" PRIu32 ")", data_buffer->cbBuffer); winpr_HexDump(TAG, WLOG_DEBUG, data_buffer->pvBuffer, data_buffer->cbBuffer); diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c index 8c4609494..83ebc19fb 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c @@ -175,7 +175,8 @@ void ntlm_print_av_pair_list(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList) size_t cbLen = 0; ntlm_av_pair_get_len(pAvPair, cbAvPair, &cbLen); - WLog_VRB(TAG, "\t%s AvId: %" PRIu16 " AvLen: %" PRIu16 "", get_av_pair_string(pair), pair); + WLog_VRB(TAG, "\t%s AvId: %" PRIu16 " AvLen: %" PRIuz "", get_av_pair_string(pair), pair, + cbLen); winpr_HexDump(TAG, WLOG_TRACE, ntlm_av_pair_get_value_pointer(pAvPair), cbLen); pAvPair = ntlm_av_pair_next(pAvPair, &cbAvPair); diff --git a/winpr/libwinpr/synch/event.c b/winpr/libwinpr/synch/event.c index 62556bf95..a5f0422c3 100644 --- a/winpr/libwinpr/synch/event.c +++ b/winpr/libwinpr/synch/event.c @@ -57,7 +57,7 @@ static void dump_event(WINPR_EVENT* event, size_t index) char** msg = nullptr; size_t used = 0; - WLog_DBG(TAG, "Event handle created still not closed! [%" PRIuz ", %p]", index, event); + WLog_DBG(TAG, "Event handle created still not closed! [%" PRIuz ", %p]", index, (void*)event); msg = winpr_backtrace_symbols(event->create_stack, &used); for (size_t i = 2; i < used; i++) @@ -545,7 +545,8 @@ void DumpEventHandles_(const char* fkt, const char* file, size_t line) if (flags >= 0) count++; } - WLog_INFO(TAG, "------- limits [%d/%d] open files %" PRIuz, r.rlim_cur, r.rlim_max, count); + WLog_INFO(TAG, "------- limits [%lu/%lu] open files %" PRIuz, (unsigned long)r.rlim_cur, + (unsigned long)r.rlim_max, count); } WLog_DBG(TAG, "--------- Start dump [%s %s:%" PRIuz "]", fkt, file, line); if (global_event_list)