mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[warnings] fix Wshadow warnings

This commit is contained in:
Armin Novak 2024-05-08 15:10:42 +02:00 committed by akallabeth
parent 1b8221e5bf
commit e272eb3966
10 changed files with 54 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/common/cmdline.c
View File

@ -2396,14 +2396,14 @@ static int parse_host_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT
if (p) if (p)
{ {
LONGLONG val = 0; LONGLONG lval = 0;
size_t length = 0; size_t length = 0;
if (!value_to_int(&p[1], &val, 1, UINT16_MAX)) if (!value_to_int(&p[1], &lval, 1, UINT16_MAX))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
length = (size_t)(p - arg->Value); length = (size_t)(p - arg->Value);
if (!freerdp_settings_set_uint32(settings, FreeRDP_ServerPort, val)) if (!freerdp_settings_set_uint32(settings, FreeRDP_ServerPort, lval))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
if (!freerdp_settings_set_string_len(settings, FreeRDP_ServerHostname, arg->Value, if (!freerdp_settings_set_string_len(settings, FreeRDP_ServerHostname, arg->Value,
length)) length))

7
libfreerdp/codec/ncrush.c
View File

@ -2936,12 +2936,12 @@ static int ncrush_generate_tables(NCRUSH_CONTEXT* context)
WINPR_ASSERT(context); WINPR_ASSERT(context);
WINPR_ASSERT(28 < ARRAYSIZE(LOMBitsLUT)); WINPR_ASSERT(28 < ARRAYSIZE(LOMBitsLUT));
UINT32 k = 0; UINT32 cnt = 0;
for (int i = 0; i < 28; i++) for (int i = 0; i < 28; i++)
{ {
for (int j = 0; j < 1 << LOMBitsLUT[i]; j++) for (int j = 0; j < 1 << LOMBitsLUT[i]; j++)
{ {
size_t l = (k++) + 2ull; size_t l = (cnt++) + 2ull;
context->HuffTableLOM[l] = (int)i; context->HuffTableLOM[l] = (int)i;
} }
} }
@ -2961,8 +2961,7 @@ static int ncrush_generate_tables(NCRUSH_CONTEXT* context)
return -1; return -1;
} }
k = 0; size_t k = 0;
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
{ {
for (int j = 0; j < 1 << CopyOffsetBitsLUT[i]; j++) for (int j = 0; j < 1 << CopyOffsetBitsLUT[i]; j++)

4
libfreerdp/codec/nsc_encode.c
View File

@ -111,7 +111,6 @@ fail:
static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UINT32 scanline) static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UINT32 scanline)
{ {
UINT16 x = 0;
UINT16 y = 0; UINT16 y = 0;
UINT16 rw = 0; UINT16 rw = 0;
BYTE ccl = 0; BYTE ccl = 0;
@ -138,7 +137,8 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI
cgplane = context->priv->PlaneBuffers[2] + y * rw; cgplane = context->priv->PlaneBuffers[2] + y * rw;
aplane = context->priv->PlaneBuffers[3] + y * context->width; aplane = context->priv->PlaneBuffers[3] + y * context->width;
for (UINT16 x = 0; x < context->width; x++) UINT16 x = 0;
for (; x < context->width; x++)
{ {
switch (context->format) switch (context->format)
{ {

10
libfreerdp/codec/planar.c
View File

@ -1675,10 +1675,12 @@ BOOL freerdp_bitmap_planar_context_reset(BITMAP_PLANAR_CONTEXT* context, UINT32
context->bgr = FALSE; context->bgr = FALSE;
context->maxWidth = PLANAR_ALIGN(width, 4); context->maxWidth = PLANAR_ALIGN(width, 4);
context->maxHeight = PLANAR_ALIGN(height, 4); context->maxHeight = PLANAR_ALIGN(height, 4);
const UINT64 tmp = (UINT64)context->maxWidth * context->maxHeight; {
if (tmp > UINT32_MAX) const UINT64 tmp = (UINT64)context->maxWidth * context->maxHeight;
return FALSE; if (tmp > UINT32_MAX)
context->maxPlaneSize = tmp; return FALSE;
context->maxPlaneSize = tmp;
}
if (context->maxWidth > UINT32_MAX / 4) if (context->maxWidth > UINT32_MAX / 4)
return FALSE; return FALSE;

38
libfreerdp/codec/progressive.c
View File

@ -1673,7 +1673,6 @@ static INLINE SSIZE_T progressive_process_tiles(PROGRESSIVE_CONTEXT* progressive
int status = 0; int status = 0;
size_t end = 0; size_t end = 0;
const size_t start = Stream_GetPosition(s); const size_t start = Stream_GetPosition(s);
UINT16 index = 0;
UINT16 blockType = 0; UINT16 blockType = 0;
UINT32 blockLen = 0; UINT32 blockLen = 0;
UINT32 count = 0; UINT32 count = 0;
@ -1779,10 +1778,10 @@ static INLINE SSIZE_T progressive_process_tiles(PROGRESSIVE_CONTEXT* progressive
return -1; return -1;
} }
for (UINT32 index = 0; index < region->numTiles; index++) for (UINT32 idx = 0; idx < region->numTiles; idx++)
{ {
RFX_PROGRESSIVE_TILE* tile = region->tiles[index]; RFX_PROGRESSIVE_TILE* tile = region->tiles[idx];
PROGRESSIVE_TILE_PROCESS_WORK_PARAM* param = &params[index]; PROGRESSIVE_TILE_PROCESS_WORK_PARAM* param = &params[idx];
param->progressive = progressive; param->progressive = progressive;
param->region = region; param->region = region;
param->context = context; param->context = context;
@ -1790,41 +1789,38 @@ static INLINE SSIZE_T progressive_process_tiles(PROGRESSIVE_CONTEXT* progressive
if (progressive->rfx_context->priv->UseThreads) if (progressive->rfx_context->priv->UseThreads)
{ {
if (!(work_objects[index] = CreateThreadpoolWork( if (!(work_objects[idx] = CreateThreadpoolWork(
progressive_process_tiles_tile_work_callback, (void*)&params[index], progressive_process_tiles_tile_work_callback, (void*)&params[idx],
&progressive->rfx_context->priv->ThreadPoolEnv))) &progressive->rfx_context->priv->ThreadPoolEnv)))
{ {
WLog_ERR(TAG, "CreateThreadpoolWork failed."); WLog_Print(progressive->log, WLOG_ERROR,
"Failed to create ThreadpoolWork for tile %" PRIu32, idx);
status = -1; status = -1;
break; break;
} }
SubmitThreadpoolWork(work_objects[index]); SubmitThreadpoolWork(work_objects[idx]);
close_cnt = index + 1; close_cnt = idx + 1;
} }
else else
{ {
progressive_process_tiles_tile_work_callback(0, &params[index], 0); progressive_process_tiles_tile_work_callback(0, &params[idx], 0);
} }
if (status < 0) if (status < 0)
{ {
WLog_Print(progressive->log, WLOG_ERROR, "Failed to decompress %s at %" PRIu16, WLog_Print(progressive->log, WLOG_ERROR, "Failed to decompress %s at %" PRIu16,
rfx_get_progressive_block_type_string(tile->blockType), index); rfx_get_progressive_block_type_string(tile->blockType), idx);
goto fail; goto fail;
} }
} }
if (status < 0)
WLog_Print(progressive->log, WLOG_ERROR,
"Failed to create ThreadpoolWork for tile %" PRIu16, index);
if (progressive->rfx_context->priv->UseThreads) if (progressive->rfx_context->priv->UseThreads)
{ {
for (UINT32 index = 0; index < close_cnt; index++) for (UINT32 idx = 0; idx < close_cnt; idx++)
{ {
WaitForThreadpoolWorkCallbacks(work_objects[index], FALSE); WaitForThreadpoolWorkCallbacks(work_objects[idx], FALSE);
CloseThreadpoolWork(work_objects[index]); CloseThreadpoolWork(work_objects[idx]);
} }
} }
@ -2525,10 +2521,10 @@ int progressive_compress(PROGRESSIVE_CONTEXT* progressive, const BYTE* pSrcData,
if (invalidRegion) if (invalidRegion)
{ {
const RECTANGLE_16* region_rects = region16_rects(invalidRegion, NULL); const RECTANGLE_16* region_rects = region16_rects(invalidRegion, NULL);
for (UINT32 x = 0; x < numRects; x++) for (UINT32 idx = 0; idx < numRects; idx++)
{ {
const RECTANGLE_16* r = &region_rects[x]; const RECTANGLE_16* r = &region_rects[idx];
RFX_RECT* rect = &rects[x]; RFX_RECT* rect = &rects[idx];
rect->x = r->left; rect->x = r->left;
rect->y = r->top; rect->y = r->top;

4
libfreerdp/common/assistance.c
View File

@ -1351,8 +1351,8 @@ BOOL freerdp_assistance_populate_settings_from_assistance_file(rdpAssistanceFile
for (size_t x = 0; x < ports; x++) for (size_t x = 0; x < ports; x++)
{ {
const UINT32 port = (UINT32)ArrayList_GetItem(file->MachinePorts, x); const UINT32 mport = (UINT32)ArrayList_GetItem(file->MachinePorts, x);
if (!freerdp_settings_set_pointer_array(settings, FreeRDP_TargetNetPorts, x, &port)) if (!freerdp_settings_set_pointer_array(settings, FreeRDP_TargetNetPorts, x, &mport))
return FALSE; return FALSE;
} }
for (size_t i = 0; i < addresses; i++) for (size_t i = 0; i < addresses; i++)

10
winpr/libwinpr/smartcard/smartcard_pcsc.c
View File

@ -1610,11 +1610,11 @@ static LONG WINAPI PCSC_SCardGetStatusChange_Internal(SCARDCONTEXT hContext, DWO
if (map[i] < 0) if (map[i] < 0)
continue; /* unmapped */ continue; /* unmapped */
PCSC_DWORD j = (PCSC_DWORD)map[i]; PCSC_DWORD k = (PCSC_DWORD)map[i];
rgReaderStates[i].dwCurrentState = (DWORD)states[j].dwCurrentState; rgReaderStates[i].dwCurrentState = (DWORD)states[k].dwCurrentState;
rgReaderStates[i].cbAtr = (DWORD)states[j].cbAtr; rgReaderStates[i].cbAtr = (DWORD)states[k].cbAtr;
CopyMemory(&(rgReaderStates[i].rgbAtr), &(states[j].rgbAtr), PCSC_MAX_ATR_SIZE); CopyMemory(&(rgReaderStates[i].rgbAtr), &(states[k].rgbAtr), PCSC_MAX_ATR_SIZE);
rgReaderStates[i].dwEventState = (DWORD)states[j].dwEventState; rgReaderStates[i].dwEventState = (DWORD)states[k].dwEventState;
} }
free(map); free(map);

20
winpr/libwinpr/synch/wait.c
View File

@ -362,20 +362,20 @@ DWORD WaitForMultipleObjectsEx(DWORD nCount, const HANDLE* lpHandles, BOOL bWait
polled = 0; polled = 0;
/* first collect file descriptors to poll */ /* first collect file descriptors to poll */
DWORD index = 0; DWORD idx = 0;
for (; index < nCount; index++) for (; idx < nCount; idx++)
{ {
if (bWaitAll) if (bWaitAll)
{ {
if (signalled_handles[index]) if (signalled_handles[idx])
continue; continue;
poll_map[polled] = index; poll_map[polled] = idx;
} }
if (!winpr_Handle_GetInfo(lpHandles[index], &Type, &Object)) if (!winpr_Handle_GetInfo(lpHandles[idx], &Type, &Object))
{ {
WLog_ERR(TAG, "invalid event file descriptor at %" PRIu32, index); WLog_ERR(TAG, "invalid event file descriptor at %" PRIu32, idx);
winpr_log_backtrace(TAG, WLOG_ERROR, 20); winpr_log_backtrace(TAG, WLOG_ERROR, 20);
SetLastError(ERROR_INVALID_HANDLE); SetLastError(ERROR_INVALID_HANDLE);
goto out; goto out;
@ -384,7 +384,7 @@ DWORD WaitForMultipleObjectsEx(DWORD nCount, const HANDLE* lpHandles, BOOL bWait
fd = winpr_Handle_getFd(Object); fd = winpr_Handle_getFd(Object);
if (fd == -1) if (fd == -1)
{ {
WLog_ERR(TAG, "invalid file descriptor at %" PRIu32, index); WLog_ERR(TAG, "invalid file descriptor at %" PRIu32, idx);
winpr_log_backtrace(TAG, WLOG_ERROR, 20); winpr_log_backtrace(TAG, WLOG_ERROR, 20);
SetLastError(ERROR_INVALID_HANDLE); SetLastError(ERROR_INVALID_HANDLE);
goto out; goto out;
@ -392,7 +392,7 @@ DWORD WaitForMultipleObjectsEx(DWORD nCount, const HANDLE* lpHandles, BOOL bWait
if (!pollset_add(&pollset, fd, Object->Mode)) if (!pollset_add(&pollset, fd, Object->Mode))
{ {
WLog_ERR(TAG, "unable to register fd in pollset at %" PRIu32, index); WLog_ERR(TAG, "unable to register fd in pollset at %" PRIu32, idx);
winpr_log_backtrace(TAG, WLOG_ERROR, 20); winpr_log_backtrace(TAG, WLOG_ERROR, 20);
SetLastError(ERROR_INVALID_HANDLE); SetLastError(ERROR_INVALID_HANDLE);
goto out; goto out;
@ -426,10 +426,10 @@ DWORD WaitForMultipleObjectsEx(DWORD nCount, const HANDLE* lpHandles, BOOL bWait
{ {
char ebuffer[256] = { 0 }; char ebuffer[256] = { 0 };
#ifdef WINPR_HAVE_POLL_H #ifdef WINPR_HAVE_POLL_H
WLog_ERR(TAG, "poll() handle %" PRIu32 " (%" PRIu32 ") failure [%d] %s", index, WLog_ERR(TAG, "poll() handle %" PRIu32 " (%" PRIu32 ") failure [%d] %s", idx,
nCount, errno, winpr_strerror(errno, ebuffer, sizeof(ebuffer))); nCount, errno, winpr_strerror(errno, ebuffer, sizeof(ebuffer)));
#else #else
WLog_ERR(TAG, "select() handle %" PRIu32 " (%" PRIu32 ") failure [%d] %s", index, WLog_ERR(TAG, "select() handle %" PRIu32 " (%" PRIu32 ") failure [%d] %s", idx,
nCount, errno, winpr_strerror(errno, ebuffer, sizeof(ebuffer))); nCount, errno, winpr_strerror(errno, ebuffer, sizeof(ebuffer)));
#endif #endif
winpr_log_backtrace(TAG, WLOG_ERROR, 20); winpr_log_backtrace(TAG, WLOG_ERROR, 20);

4
winpr/libwinpr/utils/print.c
View File

@ -109,10 +109,10 @@ void winpr_HexLogDump(wLog* log, UINT32 lvl, const void* data, size_t length)
pos += (size_t)rc; pos += (size_t)rc;
} }
for (size_t i = 0; i < line; i++) for (size_t j = 0; j < line; j++)
{ {
rc = _snprintf(&buffer[pos], blen - pos, "%c", rc = _snprintf(&buffer[pos], blen - pos, "%c",
(p[i] >= 0x20 && p[i] < 0x7F) ? (char)p[i] : '.'); (p[j] >= 0x20 && p[j] < 0x7F) ? (char)p[j] : '.');
if (rc < 0) if (rc < 0)
goto fail; goto fail;

8
winpr/tools/hash-cli/hash.c
View File

@ -189,8 +189,8 @@ int main(int argc, char* argv[])
if (format == 0) if (format == 0)
{ {
for (int index = 0; index < 16; index++) for (int idx = 0; idx < 16; idx++)
printf("%02" PRIx8 "", NtHash[index]); printf("%02" PRIx8 "", NtHash[idx]);
printf("\n"); printf("\n");
} }
@ -205,8 +205,8 @@ int main(int argc, char* argv[])
printf(":"); printf(":");
for (int index = 0; index < 16; index++) for (int idx = 0; idx < 16; idx++)
printf("%02" PRIx8 "", NtHash[index]); printf("%02" PRIx8 "", NtHash[idx]);
printf(":::"); printf(":::");
printf("\n"); printf("\n");