mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct typos and formatting errors in format strings

Browse Source 
In several files, fixed typos in format strings that were causing unexpected output and formatting issues.
This commit is contained in:
ehdgks0627 2023-07-28 18:45:58 +09:00 committed by akallabeth
parent 3df928a8d2
commit d04ba8d6ef
15 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/audin/client/opensles/audin_opensl_es.c
View File

@ -120,7 +120,7 @@ static BOOL audin_opensles_format_supported(IAudinDevice* device, const AUDIO_FO
break;
default:
WLog_Print(opensles->log, WLOG_DEBUG, "Encoding '%s' [0x%04X" PRIX16 "] not supported",
WLog_Print(opensles->log, WLOG_DEBUG, "Encoding '%s' [0x%04" PRIX16 "] not supported",
audio_format_get_tag_string(format->wFormatTag), format->wFormatTag);
break;
}

2
channels/urbdrc/client/data_transfer.c
View File

@ -1534,7 +1534,7 @@ static UINT urbdrc_process_transfer_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALL
Stream_Read_UINT16(s, Size); /** size */
Stream_Read_UINT16(s, URB_Function);
Stream_Read_UINT32(s, RequestId);
WLog_Print(urbdrc->log, WLOG_DEBUG, "URB %s[" PRIu16 "]", urb_function_string(URB_Function),
WLog_Print(urbdrc->log, WLOG_DEBUG, "URB %s[%" PRIu16 "]", urb_function_string(URB_Function),
URB_Function);
switch (URB_Function)

2
channels/urbdrc/client/libusb/libusb_udevice.c
View File

@ -550,7 +550,7 @@ static int libusb_udev_select_interface(IUDEVICE* idev, BYTE InterfaceNumber, BY
{
WLog_Print(urbdrc->log, WLOG_INFO,
"select Interface(%" PRIu8 ") curr AlternateSetting(%" PRIu8
") new AlternateSetting(" PRIu8 ")",
") new AlternateSetting(%" PRIu8 ")",
InterfaceNumber, MsInterfaces[InterfaceNumber]->AlternateSetting,
AlternateSetting);

2
channels/urbdrc/client/libusb/libusb_udevman.c
View File

@ -239,7 +239,7 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE
}
else
{
WLog_Print(urbdrc->log, WLOG_ERROR, "udevman_register_udevice: Invalid flag=%08 " PRIx32,
WLog_Print(urbdrc->log, WLOG_ERROR, "udevman_register_udevice: Invalid flag=%08" PRIx32,
flag);
return 0;
}

2
libfreerdp/codec/clear.c
View File

@ -1061,7 +1061,7 @@ INT32 clear_decompress(CLEAR_CONTEXT* clear, const BYTE* pSrcData, UINT32 SrcSiz
goto finish;
WLog_ERR(TAG,
"invalid glyphFlags, missing flags: 0x%0x" PRIx8 " & 0x%02" PRIx32
"invalid glyphFlags, missing flags: 0x%02" PRIx8 " & 0x%02" PRIx32
" == 0x%02" PRIx32,
glyphFlags, mask, glyphFlags & mask);
goto fail;

2
libfreerdp/codec/planar.c
View File

@ -1520,7 +1520,7 @@ BYTE* freerdp_bitmap_compress_planar(BITMAP_PLANAR_CONTEXT* context, const BYTE*
#if defined(WITH_DEBUG_CODECS)
WLog_DBG(TAG,
"R: [%" PRIu32 "/%" PRIu32 "] G: [%" PRIu32 "/%" PRIu32 "] B: [% " PRIu32
"R: [%" PRIu32 "/%" PRIu32 "] G: [%" PRIu32 "/%" PRIu32 "] B: [%" PRIu32
" / %" PRIu32 "] ",
dstSizes[1], planeSize, dstSizes[2], planeSize, dstSizes[3], planeSize);
#endif

2
libfreerdp/codec/progressive.c
View File

@ -1740,7 +1740,7 @@ static INLINE SSIZE_T progressive_process_tiles(PROGRESSIVE_CONTEXT* progressive
return -1032;
break;
default:
WLog_ERR(TAG, "Invalid block type %04 (%s)" PRIx16, blockType,
WLog_ERR(TAG, "Invalid block type %04" PRIx16 " (%s)", blockType,
progressive_get_block_type_string(blockType));
return -1039;
}

3
libfreerdp/codec/rfx.c
View File

@ -1283,8 +1283,7 @@ BOOL rfx_process_message(RFX_CONTEXT* context, const BYTE* data, UINT32 length,
{
region16_uninit(&updateRegion);
WLog_Print(context->priv->log, WLOG_ERROR,
"nbUpdateRectx[% " PRIu32 " (%" PRIu32
")] freerdp_image_copy failed",
"nbUpdateRectx[%" PRIu32 " (%" PRIu32 ")] freerdp_image_copy failed",
j, nbUpdateRects);
return FALSE;
}

2
libfreerdp/core/connection.c
View File

@ -1147,7 +1147,7 @@ BOOL rdp_client_connect_auto_detect(rdpRdp* rdp, wStream* s)
}
}
else
WLog_WARN(TAG, "expected messageChannelId=" PRIu16 ", got %" PRIu16, messageChannelId,
WLog_WARN(TAG, "expected messageChannelId=%" PRIu16 ", got %" PRIu16, messageChannelId,
channelId);
Stream_SetPosition(s, pos);

4
libfreerdp/core/gateway/rdg.c
View File

@ -269,7 +269,7 @@ static BOOL rdg_read_http_unicode_string(wStream* s, const WCHAR** string, UINT1
/* Read length of the string */
if (!Stream_CheckAndLogRequiredLength(TAG, s, 4))
{
WLog_ERR(TAG, "Could not read stream length, only have % " PRIuz " bytes", rem);
WLog_ERR(TAG, "Could not read stream length, only have %" PRIuz " bytes", rem);
return FALSE;
}
Stream_Read_UINT16(s, strLenBytes);
@ -280,7 +280,7 @@ static BOOL rdg_read_http_unicode_string(wStream* s, const WCHAR** string, UINT1
/* seek past the string - if this fails something is wrong */
if (!Stream_SafeSeek(s, strLenBytes))
{
WLog_ERR(TAG, "Could not read stream data, only have % " PRIuz " bytes, expected %" PRIu16,
WLog_ERR(TAG, "Could not read stream data, only have %" PRIuz " bytes, expected %" PRIu16,
rem - 4, strLenBytes);
return FALSE;
}

2
libfreerdp/core/gcc.c
View File

@ -2279,7 +2279,7 @@ BOOL gcc_write_client_monitor_data(wStream* s, const rdpMcs* mcs)
const UINT32 flags = current->is_primary ? MONITOR_PRIMARY : 0;
WLog_DBG(TAG,
"Monitor[%" PRIu32 "]: top=%" PRIu32 ", left=%" PRIu32 ", bottom=%" PRIu32
", right=%" PRIu32 ", flags" PRIu32,
", right=%" PRIu32 ", flags=%" PRIu32,
i, top, left, bottom, right, flags);
Stream_Write_UINT32(s, left); /* left */
Stream_Write_UINT32(s, top); /* top */

2
libfreerdp/core/nego.c
View File

@ -1201,7 +1201,7 @@ static BOOL nego_process_correlation_info(rdpNego* nego, wStream* s)
Stream_Seek(s, 16); /* skip reserved bytes */
WLog_INFO(TAG,
"RDP_NEG_CORRELATION_INFO::correlationId = { %02 " PRIx8 ", %02" PRIx8 ", %02" PRIx8
"RDP_NEG_CORRELATION_INFO::correlationId = { %02" PRIx8 ", %02" PRIx8 ", %02" PRIx8
", %02" PRIx8 ", %02" PRIx8 ", %02" PRIx8 ", %02" PRIx8 ", %02" PRIx8 ", %02" PRIx8
", %02" PRIx8 ", %02" PRIx8 ", %02" PRIx8 ", %02" PRIx8 ", %02" PRIx8 ", %02" PRIx8
", %02" PRIx8 " }",

2
libfreerdp/locale/keyboard_xkbfile.c
View File

@ -347,7 +347,7 @@ int freerdp_keyboard_init_xkbfile(DWORD* keyboardLayoutId, DWORD x11_keycode_to_
if (*keyboardLayoutId == 0)
{
detect_keyboard_layout_from_xkbfile(display, keyboardLayoutId);
DEBUG_KBD("detect_keyboard_layout_from_xkb: %" PRIu32 " (0x%08X" PRIX32 ")",
DEBUG_KBD("detect_keyboard_layout_from_xkb: %" PRIu32 " (0x%08" PRIX32 ")",
*keyboardLayoutId, *keyboardLayoutId);
}

2
server/proxy/channels/pf_channel_rdpdr.c
View File

@ -463,7 +463,7 @@ static UINT rdpdr_process_client_name_request(pf_channel_server_context* rdpdr,
if (!Stream_CheckAndLogRequiredLengthSrv(rdpdr->log, s, rdpdr->common.computerNameLen))
{
SERVER_RX_LOG(
rdpdr->log, WLOG_WARN, "[%s | %s]: missing data, got " PRIu32 ", expected %" PRIu32,
rdpdr->log, WLOG_WARN, "[%s | %s]: missing data, got %" PRIu32 ", expected %" PRIu32,
rdpdr_component_string(RDPDR_CTYP_CORE), rdpdr_packetid_string(PAKID_CORE_CLIENT_NAME),
Stream_GetRemainingLength(s), rdpdr->common.computerNameLen);
return ERROR_INVALID_DATA;

2
winpr/test/TestTypes.c
View File

@ -104,7 +104,7 @@ static BOOL test_co_errors(void)
const LONG b = should[x];
if (a != b)
{
printf("mismatch[%" PRIuz "]: %0x" PRIx32 " vs %08" PRIx32 "\n", x, a, b);
printf("mismatch[%" PRIuz "]: %08" PRIx32 " vs %08" PRIx32 "\n", x, a, b);
return FALSE;
}
}