[string,format] fix format strings for debug messages

This commit is contained in:
Armin Novak
2026-03-03 14:07:49 +01:00
parent a9e0abf2ea
commit 81526b19a2
5 changed files with 9 additions and 7 deletions

View File

@@ -239,7 +239,7 @@ static UINT rdpei_send_pdu(GENERIC_CHANNEL_CALLBACK* callback, wStream* s, UINT1
Stream_Buffer(s), nullptr); Stream_Buffer(s), nullptr);
#ifdef WITH_DEBUG_RDPEI #ifdef WITH_DEBUG_RDPEI
WLog_Print(rdpei->base.log, WLOG_DEBUG, 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); eventId, rdpei_eventid_string(eventId), pduLength, status);
#endif #endif
return status; return status;

View File

@@ -498,7 +498,7 @@ int freerdp_keyboard_load_map_from_xkbfile(void* display, DWORD* x11_keycode_to_
if (!found) 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 else
status = 0; status = 0;

View File

@@ -1170,7 +1170,7 @@ hmac_fail:
} }
#ifdef WITH_DEBUG_NTLM #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); winpr_HexDump(TAG, WLOG_DEBUG, data, length);
WLog_DBG(TAG, "Encrypted Data Buffer (length = %" PRIu32 ")", data_buffer->cbBuffer); WLog_DBG(TAG, "Encrypted Data Buffer (length = %" PRIu32 ")", data_buffer->cbBuffer);
winpr_HexDump(TAG, WLOG_DEBUG, data_buffer->pvBuffer, data_buffer->cbBuffer); winpr_HexDump(TAG, WLOG_DEBUG, data_buffer->pvBuffer, data_buffer->cbBuffer);
@@ -1279,7 +1279,7 @@ hmac_fail:
} }
#ifdef WITH_DEBUG_NTLM #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); winpr_HexDump(TAG, WLOG_DEBUG, data, length);
WLog_DBG(TAG, "Data Buffer (length = %" PRIu32 ")", data_buffer->cbBuffer); WLog_DBG(TAG, "Data Buffer (length = %" PRIu32 ")", data_buffer->cbBuffer);
winpr_HexDump(TAG, WLOG_DEBUG, data_buffer->pvBuffer, data_buffer->cbBuffer); winpr_HexDump(TAG, WLOG_DEBUG, data_buffer->pvBuffer, data_buffer->cbBuffer);

View File

@@ -175,7 +175,8 @@ void ntlm_print_av_pair_list(NTLM_AV_PAIR* pAvPairList, size_t cbAvPairList)
size_t cbLen = 0; size_t cbLen = 0;
ntlm_av_pair_get_len(pAvPair, cbAvPair, &cbLen); 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); winpr_HexDump(TAG, WLOG_TRACE, ntlm_av_pair_get_value_pointer(pAvPair), cbLen);
pAvPair = ntlm_av_pair_next(pAvPair, &cbAvPair); pAvPair = ntlm_av_pair_next(pAvPair, &cbAvPair);

View File

@@ -57,7 +57,7 @@ static void dump_event(WINPR_EVENT* event, size_t index)
char** msg = nullptr; char** msg = nullptr;
size_t used = 0; 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); msg = winpr_backtrace_symbols(event->create_stack, &used);
for (size_t i = 2; i < used; i++) 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) if (flags >= 0)
count++; 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); WLog_DBG(TAG, "--------- Start dump [%s %s:%" PRIuz "]", fkt, file, line);
if (global_event_list) if (global_event_list)