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

[warnings] fix integer casting

Browse Source 
* use WINPR_ASSERTING_INT_CAST where possible
* clean up client code
This commit is contained in:
akallabeth
2024-12-19 12:44:51 +01:00
parent 411c3b4e06
commit 6701359cc1
50 changed files with 793 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/common/cmdline.c
View File

@@ -369,7 +369,7 @@ static SSIZE_T forced_newline_at(const char* text, size_t len, size_t limit,
const char* tok = strchr(text, d);
if (tok)
{
const size_t offset = tok - text;
const size_t offset = WINPR_ASSERTING_INT_CAST(size_t, tok - text);
if ((offset > len) || (offset > limit))
continue;
return (SSIZE_T)(offset);
@@ -461,8 +461,9 @@ static size_t print_description(const char* text, size_t start_offset, size_t cu
const int rc = printf("\n");
if (rc >= 0)
{
WINPR_ASSERT(SIZE_MAX - rc > current);
current += (size_t)rc;
const size_t src = WINPR_ASSERTING_INT_CAST(size_t, rc);
WINPR_ASSERT(SIZE_MAX - src > current);
current += src;
}
return current;
}
@@ -497,7 +498,7 @@ static void freerdp_client_print_command_line_args(COMMAND_LINE_ARGUMENT_A* parg
if (arg->Flags & (COMMAND_LINE_VALUE_BOOL | COMMAND_LINE_VALUE_FLAG))
{
if ((arg->Flags & ~COMMAND_LINE_VALUE_BOOL) == 0)
if ((arg->Flags & (uint32_t)~COMMAND_LINE_VALUE_BOOL) == 0)
rc = printf(" %s%s", arg->Default ? "-" : "+", arg->Name);
else if ((arg->Flags & COMMAND_LINE_VALUE_OPTIONAL) != 0)
rc = printf(" [%s|/]%s", arg->Default ? "-" : "+", arg->Name);
@@ -3104,7 +3105,7 @@ static int parse_clipboard_options(rdpSettings* settings, const COMMAND_LINE_ARG
{
const UINT32 mask =
freerdp_settings_get_uint32(settings, FreeRDP_ClipboardFeatureMask) &
~(CLIPRDR_FLAG_LOCAL_TO_REMOTE | CLIPRDR_FLAG_REMOTE_TO_LOCAL);
(uint32_t)~(CLIPRDR_FLAG_LOCAL_TO_REMOTE | CLIPRDR_FLAG_REMOTE_TO_LOCAL);
const PARSE_CLIP_DIR_RESULT bval = parse_clip_direciton_to_option(cur);
UINT32 bflags = 0;
switch (bval)
@@ -3134,7 +3135,8 @@ static int parse_clipboard_options(rdpSettings* settings, const COMMAND_LINE_ARG
{
const UINT32 mask =
freerdp_settings_get_uint32(settings, FreeRDP_ClipboardFeatureMask) &
~(CLIPRDR_FLAG_LOCAL_TO_REMOTE_FILES | CLIPRDR_FLAG_REMOTE_TO_LOCAL_FILES);
(uint32_t)~(CLIPRDR_FLAG_LOCAL_TO_REMOTE_FILES |
CLIPRDR_FLAG_REMOTE_TO_LOCAL_FILES);
const PARSE_CLIP_DIR_RESULT bval = parse_clip_direciton_to_option(cur);
UINT32 bflags = 0;
switch (bval)