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

Merge pull request #12152 from akallabeth/fmt-warn-fixes

Browse Source 
[warnings,format] fix format string warnings
This commit is contained in:
akallabeth
2026-01-16 14:49:18 +01:00
committed by GitHub
parent 90f62bd353 e02a55d434
commit 3370e30e92
18 changed files with 40 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channels/ainput/server/ainput_main.c
View File

@@ -436,21 +436,18 @@ void ainput_server_context_free(ainput_server_context* context)
static UINT ainput_process_message(ainput_server* ainput)
{
BOOL rc = 0;
UINT error = ERROR_INTERNAL_ERROR;
ULONG BytesReturned = 0;
ULONG ActualBytesReturned = 0;
UINT16 MessageId = 0;
wStream* s = NULL;
WINPR_ASSERT(ainput);
WINPR_ASSERT(ainput->ainput_channel);
s = ainput->buffer;
wStream* s = ainput->buffer;
WINPR_ASSERT(s);
Stream_SetPosition(s, 0);
rc = WTSVirtualChannelRead(ainput->ainput_channel, 0, NULL, 0, &BytesReturned);
const BOOL rc = WTSVirtualChannelRead(ainput->ainput_channel, 0, NULL, 0, &BytesReturned);
if (!rc)
goto out;
@@ -482,7 +479,7 @@ static UINT ainput_process_message(ainput_server* ainput)
}
Stream_SetLength(s, ActualBytesReturned);
Stream_Read_UINT16(s, MessageId);
const UINT16 MessageId = Stream_Get_UINT16(s);
switch (MessageId)
{
@@ -491,7 +488,7 @@ static UINT ainput_process_message(ainput_server* ainput)
break;
default:
WLog_ERR(TAG, "audin_server_thread_func: unknown MessageId %" PRIu8 "", MessageId);
WLog_ERR(TAG, "audin_server_thread_func: unknown MessageId %" PRIu16 "", MessageId);
break;
}

2
channels/printer/client/cups/printer_cups.c
View File

@@ -70,7 +70,7 @@ static bool is_mac_os_sonoma_or_later(void)
const int rc = sscanf(str, "%d.%d.%d", &major, &minor, &patch);
if (rc != 3)
{
WLog_WARN(TAG, "could not match '%s' to format '%d.%d.%d'");
WLog_WARN(TAG, "could not match '%s' to format '%d.%d.%d'", str, major, minor, patch);
return false;
}

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
{

34
client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c
View File

@@ -182,23 +182,20 @@ static BOOL android_desktop_resize(rdpContext* context)
static BOOL android_pre_connect(freerdp* instance)
{
int rc;
rdpSettings* settings;
WINPR_ASSERT(instance);
WINPR_ASSERT(instance->context);
settings = instance->context->settings;
rdpSettings* settings = instance->context->settings;
if (!settings)
return FALSE;
rc = PubSub_SubscribeChannelConnected(instance->context->pubSub,
android_OnChannelConnectedEventHandler);
int rc = PubSub_SubscribeChannelConnected(instance->context->pubSub,
android_OnChannelConnectedEventHandler);
if (rc != CHANNEL_RC_OK)
{
WLog_ERR(TAG, "Could not subscribe to connect event handler [%l08X]", rc);
WLog_ERR(TAG, "Could not subscribe to connect event handler [%08X]", rc);
return FALSE;
}
@@ -207,7 +204,7 @@ static BOOL android_pre_connect(freerdp* instance)
if (rc != CHANNEL_RC_OK)
{
WLog_ERR(TAG, "Could not subscribe to disconnect event handler [%l08X]", rc);
WLog_ERR(TAG, "Could not subscribe to disconnect event handler [%08X]", rc);
return FALSE;
}
@@ -448,8 +445,8 @@ static int android_freerdp_run(freerdp* instance)
if (status == WAIT_FAILED)
{
WLog_ERR(TAG, "WaitForMultipleObjects failed with %" PRIu32 " [%08lX]", status,
GetLastError());
WLog_ERR(TAG, "WaitForMultipleObjects failed with %u [%08X]", status,
(unsigned)GetLastError());
break;
}
@@ -650,7 +647,7 @@ JNIEXPORT jlong JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp
if (setenv("HOME", _strdup(envStr), 1) != 0)
{
char ebuffer[256] = { 0 };
WLog_FATAL(TAG, "Failed to set environment HOME=%s %s [%d]", env,
WLog_FATAL(TAG, "Failed to set environment HOME=%s %s [%d]", envStr,
winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno);
return (jlong)NULL;
}
@@ -732,15 +729,14 @@ JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_free
JNIEnv* env, jclass cls, jlong instance)
{
freerdp* inst = (freerdp*)instance;
androidContext* ctx;
if (!inst || !inst->context)
{
WLog_FATAL(TAG, "(env=%p, cls=%p, instance=%d", (void*)env, (void*)cls, instance);
WLog_FATAL(TAG, "(env=%p, cls=%p, instance=%lld", (void*)env, (void*)cls, instance);
return JNI_FALSE;
}
ctx = (androidContext*)inst->context;
androidContext* ctx = (androidContext*)inst->context;
if (!(ctx->thread = CreateThread(NULL, 0, android_thread_func, inst, 0, NULL)))
{
@@ -754,17 +750,15 @@ JNIEXPORT jboolean JNICALL Java_com_freerdp_freerdpcore_services_LibFreeRDP_free
JNIEnv* env, jclass cls, jlong instance)
{
freerdp* inst = (freerdp*)instance;
androidContext* ctx;
ANDROID_EVENT* event;
if (!inst || !inst->context || !cls || !env)
{
WLog_FATAL(TAG, "(env=%p, cls=%p, instance=%d", (void*)env, (void*)cls, instance);
WLog_FATAL(TAG, "(env=%p, cls=%p, instance=%lld", (void*)env, (void*)cls, instance);
return JNI_FALSE;
}
ctx = (androidContext*)inst->context;
event = (ANDROID_EVENT*)android_event_disconnect_new();
androidContext* ctx = (androidContext*)inst->context;
ANDROID_EVENT* event = (ANDROID_EVENT*)android_event_disconnect_new();
if (!event)
return JNI_FALSE;
@@ -798,7 +792,7 @@ Java_com_freerdp_freerdpcore_services_LibFreeRDP_freerdp_1update_1graphics(JNIEn
if (!env || !cls || !inst)
{
WLog_FATAL(TAG, "(env=%p, cls=%p, instance=%d", (void*)env, (void*)cls, instance);
WLog_FATAL(TAG, "(env=%p, cls=%p, instance=%lld", (void*)env, (void*)cls, instance);
return JNI_FALSE;
}

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

5
libfreerdp/codec/clear.c
View File

@@ -337,7 +337,8 @@ static BOOL clear_resize_buffer(CLEAR_CONTEXT* WINPR_RESTRICT clear, UINT32 widt
if (size > clear->TempSize / bpp)
{
BYTE* tmp = (BYTE*)winpr_aligned_recalloc(clear->TempBuffer, size, bpp, 32);
BYTE* tmp = (BYTE*)winpr_aligned_recalloc(clear->TempBuffer,
WINPR_ASSERTING_INT_CAST(size_t, size), bpp, 32);
if (!tmp)
{
@@ -346,7 +347,7 @@ static BOOL clear_resize_buffer(CLEAR_CONTEXT* WINPR_RESTRICT clear, UINT32 widt
return FALSE;
}
clear->TempSize = size * bpp;
clear->TempSize = WINPR_ASSERTING_INT_CAST(size_t, size* bpp);
clear->TempBuffer = tmp;
}

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

2
libfreerdp/core/tcp.c
View File

@@ -808,7 +808,7 @@ static BOOL freerdp_tcp_is_hostname_resolvable(rdpContext* context, const char*
}
static BOOL freerdp_tcp_connect_timeout(rdpContext* context, int sockfd, struct sockaddr* addr,
socklen_t addrlen, UINT32 timeout)
size_t addrlen, UINT32 timeout)
{
BOOL rc = FALSE;
HANDLE handles[2] = { 0 };

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

2
libfreerdp/utils/rdpdr_utils.c
View File

@@ -653,7 +653,7 @@ const char* rdpdr_irp_mask2str(UINT32 ioCode1Mask, char* buffer, size_t len)
for (size_t x = 0; x < 32; x++)
{
const UINT32 mask = (1 << x);
const UINT32 mask = (1u << x);
if (ioCode1Mask & mask)
{
if (!winpr_str_append(rdpdr_irp_val2str(mask), &buffer[1], len - 1, "|"))

1
server/Sample/sfreerdp.c
View File

@@ -692,7 +692,6 @@ static BOOL tf_peer_post_connect(freerdp_peer* client)
/* A real server may perform OS login here if NLA is not executed previously. */
}
WLog_DBG(TAG, "");
WLog_DBG(TAG, "Client requested desktop: %" PRIu32 "x%" PRIu32 "x%" PRIu32 "",
freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth),
freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight),

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