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

[warnings,format] fix format string warnings

Browse Source
This commit is contained in:
akallabeth
2026-01-16 13:13:27 +01:00
parent 90f62bd353
commit 93952b87c3
5 changed files with 20 additions and 29 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;
}

30
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);
const 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 [%08lX]", 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 [%08lX]", rc);
return FALSE;
}
@@ -449,7 +446,7 @@ static int android_freerdp_run(freerdp* instance)
if (status == WAIT_FAILED)
{
WLog_ERR(TAG, "WaitForMultipleObjects failed with %" PRIu32 " [%08lX]", status,
GetLastError());
(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=%ld", (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=%ld", (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;

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

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