From fb8efd45f209040201cb8089b7c11d034a68cc01 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 16 Jan 2026 13:36:14 +0100 Subject: [PATCH] [c,format] fix format string and review warnings --- channels/rdpdr/client/devman.c | 2 +- channels/rdpsnd/client/pulse/rdpsnd_pulse.c | 2 +- channels/tsmf/client/tsmf_main.c | 8 +++----- client/X11/xf_client.c | 4 ++-- libfreerdp/codec/interleaved.c | 3 +-- libfreerdp/core/security.c | 6 ++---- libfreerdp/crypto/x509_utils.c | 4 ++-- server/proxy/pf_config.c | 3 +-- winpr/libwinpr/ncrypt/ncrypt.c | 2 +- winpr/libwinpr/path/shell.c | 3 +-- winpr/libwinpr/synch/mutex.c | 2 +- 11 files changed, 16 insertions(+), 23 deletions(-) diff --git a/channels/rdpdr/client/devman.c b/channels/rdpdr/client/devman.c index 00dbada93..8c99c198c 100644 --- a/channels/rdpdr/client/devman.c +++ b/channels/rdpdr/client/devman.c @@ -131,7 +131,7 @@ DEVICE* devman_get_device_by_id(DEVMAN* devman, UINT32 id) if (!devman) { - WLog_ERR(TAG, "device manager=%p", WINPR_CXX_COMPAT_CAST(const void*, devman)); + WLog_ERR(TAG, "device manager=NULL"); return NULL; } diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index a12a586d4..c74c5e4cc 100644 --- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c +++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c @@ -65,7 +65,7 @@ static BOOL rdpsnd_check_pulse(rdpsndPulsePlugin* pulse, BOOL haveStream) if (!pulse->context) { - WLog_WARN(TAG, "pulse->context=%p", WINPR_CXX_COMPAT_CAST(const void*, pulse->context)); + WLog_WARN(TAG, "pulse->context=NULL"); rc = FALSE; } diff --git a/channels/tsmf/client/tsmf_main.c b/channels/tsmf/client/tsmf_main.c index 1b64051b6..dbfa404ca 100644 --- a/channels/tsmf/client/tsmf_main.c +++ b/channels/tsmf/client/tsmf_main.c @@ -100,11 +100,9 @@ BOOL tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, UINT32 mess if (!callback->channel || !callback->channel->Write) { - WLog_ERR(TAG, "callback=%p, channel=%p, write=%p", - WINPR_CXX_COMPAT_CAST(const void*, callback), - WINPR_CXX_COMPAT_CAST(const void*, callback ? callback->channel : NULL), - WINPR_CXX_COMPAT_CAST( - const void*, callback && callback->channel ? callback->channel->Write : NULL)); + WLog_ERR(TAG, "channel=%p, write=%p", WINPR_CXX_COMPAT_CAST(const void*, callback->channel), + WINPR_CXX_COMPAT_CAST(const void*, + callback->channel ? callback->channel->Write : NULL)); } else { diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c index 6391540ae..2f7e2d8c6 100644 --- a/client/X11/xf_client.c +++ b/client/X11/xf_client.c @@ -304,7 +304,7 @@ void xf_draw_screen_(xfContext* xfc, int x, int y, int w, int h, const char* fkt { if (!xfc) { - WLog_DBG(TAG, "called from [%s] xfc=%p", fkt, WINPR_CXX_COMPAT_CAST(const void*, xfc)); + WLog_DBG(TAG, "called from [%s] xfc=NULL", fkt); return; } @@ -316,7 +316,7 @@ void xf_draw_screen_(xfContext* xfc, int x, int y, int w, int h, const char* fkt if (!xfc->window) { - WLog_WARN(TAG, "invalid xfc->window=%p", WINPR_CXX_COMPAT_CAST(const void*, xfc->window)); + WLog_WARN(TAG, "invalid xfc->window=NULL"); return; } diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c index 686eccbb2..44810deb5 100644 --- a/libfreerdp/codec/interleaved.c +++ b/libfreerdp/codec/interleaved.c @@ -586,8 +586,7 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleav if (!interleaved->TempBuffer) { - WLog_ERR(TAG, "interleaved->TempBuffer=%p", - WINPR_CXX_COMPAT_CAST(const void*, interleaved->TempBuffer)); + WLog_ERR(TAG, "interleaved->TempBuffer=NULL"); return FALSE; } diff --git a/libfreerdp/core/security.c b/libfreerdp/core/security.c index 67986e5ab..2832e7c75 100644 --- a/libfreerdp/core/security.c +++ b/libfreerdp/core/security.c @@ -831,8 +831,7 @@ BOOL security_encrypt(BYTE* data, size_t length, rdpRdp* rdp) WINPR_ASSERT(rdp); if (!rdp->rc4_encrypt_key) { - WLog_ERR(TAG, "rdp->rc4_encrypt_key=%p", - WINPR_CXX_COMPAT_CAST(const void*, rdp->rc4_encrypt_key)); + WLog_ERR(TAG, "rdp->rc4_encrypt_key=NULL"); goto fail; } @@ -864,8 +863,7 @@ BOOL security_decrypt(BYTE* data, size_t length, rdpRdp* rdp) if (!rdp->rc4_decrypt_key) { - WLog_ERR(TAG, "rdp->rc4_decrypt_key=%p", - WINPR_CXX_COMPAT_CAST(const void*, rdp->rc4_decrypt_key)); + WLog_ERR(TAG, "rdp->rc4_decrypt_key=NULL"); goto fail; } diff --git a/libfreerdp/crypto/x509_utils.c b/libfreerdp/crypto/x509_utils.c index 579ffc993..b7a1e584a 100644 --- a/libfreerdp/crypto/x509_utils.c +++ b/libfreerdp/crypto/x509_utils.c @@ -108,7 +108,7 @@ char* x509_utils_get_subject(const X509* xcert) char* subject = NULL; if (!xcert) { - WLog_ERR(TAG, "Invalid certificate %p", WINPR_CXX_COMPAT_CAST(const void*, xcert)); + WLog_ERR(TAG, "Invalid certificate NULL"); return NULL; } subject = crypto_print_name(X509_get_subject_name(xcert)); @@ -562,7 +562,7 @@ char* x509_utils_get_issuer(const X509* xcert) char* issuer = NULL; if (!xcert) { - WLog_ERR(TAG, "Invalid certificate %p", WINPR_CXX_COMPAT_CAST(const void*, xcert)); + WLog_ERR(TAG, "Invalid certificate NULL"); return NULL; } issuer = crypto_print_name(X509_get_issuer_name(xcert)); diff --git a/server/proxy/pf_config.c b/server/proxy/pf_config.c index 1a5bc14d9..e3cd4eb47 100644 --- a/server/proxy/pf_config.c +++ b/server/proxy/pf_config.c @@ -378,8 +378,7 @@ static char* pf_config_decode_base64(const char* data, const char* name, size_t* char* decoded = NULL; if (!data) { - WLog_ERR(TAG, "Invalid base64 data [%p] for %s", WINPR_CXX_COMPAT_CAST(const void*, data), - name); + WLog_ERR(TAG, "Invalid base64 data [NULL] for %s", name); return NULL; } diff --git a/winpr/libwinpr/ncrypt/ncrypt.c b/winpr/libwinpr/ncrypt/ncrypt.c index a39a96e77..18d64e30b 100644 --- a/winpr/libwinpr/ncrypt/ncrypt.c +++ b/winpr/libwinpr/ncrypt/ncrypt.c @@ -36,7 +36,7 @@ SECURITY_STATUS checkNCryptHandle(NCRYPT_HANDLE handle, NCryptHandleType matchTy { if (!handle) { - WLog_VRB(TAG, "invalid handle '%p'", WINPR_CXX_COMPAT_CAST(const void*, handle)); + WLog_VRB(TAG, "invalid handle 'NULL'"); return ERROR_INVALID_PARAMETER; } diff --git a/winpr/libwinpr/path/shell.c b/winpr/libwinpr/path/shell.c index 501549786..f647e8f08 100644 --- a/winpr/libwinpr/path/shell.c +++ b/winpr/libwinpr/path/shell.c @@ -388,8 +388,7 @@ char* GetKnownPath(eKnownPathTypes id) } if (!path) - WLog_WARN(TAG, "Path %s is %p", GetKnownPathIdString(WINPR_ASSERTING_INT_CAST(int, id)), - WINPR_CXX_COMPAT_CAST(const void*, path)); + WLog_WARN(TAG, "Path %s is NULL", GetKnownPathIdString(WINPR_ASSERTING_INT_CAST(int, id))); return path; } diff --git a/winpr/libwinpr/synch/mutex.c b/winpr/libwinpr/synch/mutex.c index 91e4081ea..99f5bac03 100644 --- a/winpr/libwinpr/synch/mutex.c +++ b/winpr/libwinpr/synch/mutex.c @@ -190,7 +190,7 @@ HANDLE CreateMutexExW(LPSECURITY_ATTRIBUTES lpMutexAttributes, LPCWSTR lpName, D if (dwDesiredAccess != 0) { char name[MAX_PATH] = { 0 }; - ConvertWCharToUtf8(lpName, name, sizeof(name)); + ConvertWCharToUtf8(lpName, name, sizeof(name) - 1); WLog_WARN(TAG, "[%s] does not support dwDesiredAccess 0x%08" PRIx32, name, dwDesiredAccess); }