morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[c,format] fix format string and review warnings

Browse Source
This commit is contained in:
akallabeth
2026-01-16 13:36:14 +01:00
parent 832da09b3e
commit fb8efd45f2
11 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/rdpdr/client/devman.c
View File

@@ -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;
}

2
channels/rdpsnd/client/pulse/rdpsnd_pulse.c
View File

@@ -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;
}

8
channels/tsmf/client/tsmf_main.c
View File

@@ -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
{

4
client/X11/xf_client.c
View File

@@ -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;
}

3
libfreerdp/codec/interleaved.c
View File

@@ -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;
}

6
libfreerdp/core/security.c
View File

@@ -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;
}

4
libfreerdp/crypto/x509_utils.c
View File

@@ -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));

3
server/proxy/pf_config.c
View File

@@ -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;
}

2
winpr/libwinpr/ncrypt/ncrypt.c
View File

@@ -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;
}

3
winpr/libwinpr/path/shell.c
View File

@@ -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;
}

2
winpr/libwinpr/synch/mutex.c
View File

@@ -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);
}