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

Fixed -Wshadow

Browse Source
This commit is contained in:
Armin Novak 2022-11-21 08:35:51 +01:00 committed by Martin Fleisz
parent 31c1700c0c
commit b56b09840a
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libfreerdp/core/connection.c
View File

@ -394,7 +394,7 @@ BOOL rdp_client_connect(rdpRdp* rdp)
for (; now < dueDate; now = GetTickCount64()) for (; now < dueDate; now = GetTickCount64())
{ {
HANDLE events[MAXIMUM_WAIT_OBJECTS] = { 0 }; HANDLE events[MAXIMUM_WAIT_OBJECTS] = { 0 };
DWORD status = 0; DWORD wstatus = 0;
DWORD nevents = freerdp_get_event_handles(rdp->context, events, ARRAYSIZE(events)); DWORD nevents = freerdp_get_event_handles(rdp->context, events, ARRAYSIZE(events));
if (!nevents) if (!nevents)
{ {
@ -402,8 +402,8 @@ BOOL rdp_client_connect(rdpRdp* rdp)
return FALSE; return FALSE;
} }
status = WaitForMultipleObjectsEx(nevents, events, FALSE, (dueDate - now), TRUE); wstatus = WaitForMultipleObjectsEx(nevents, events, FALSE, (dueDate - now), TRUE);
switch (status) switch (wstatus)
{ {
case WAIT_TIMEOUT: case WAIT_TIMEOUT:
/* will make us quit with a timeout */ /* will make us quit with a timeout */

6
libfreerdp/core/nla.c
View File

@ -1163,7 +1163,7 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla)
{ 4, FreeRDP_CspName } }; { 4, FreeRDP_CspName } };
WinPrAsn1_OctetString octet_string = { 0 }; WinPrAsn1_OctetString octet_string = { 0 };
char* str; char* str;
BOOL ret; BOOL res;
/* TSSmartCardCreds */ /* TSSmartCardCreds */
if (!WinPrAsn1EncSeqContainer(enc)) if (!WinPrAsn1EncSeqContainer(enc))
@ -1173,9 +1173,9 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla)
str = freerdp_settings_get_string_writable(settings, FreeRDP_Password); str = freerdp_settings_get_string_writable(settings, FreeRDP_Password);
octet_string.len = octet_string.len =
ConvertToUnicode(CP_UTF8, 0, str, -1, (LPWSTR*)&octet_string.data, 0) * sizeof(WCHAR); ConvertToUnicode(CP_UTF8, 0, str, -1, (LPWSTR*)&octet_string.data, 0) * sizeof(WCHAR);
ret = WinPrAsn1EncContextualOctetString(enc, 0, &octet_string); res = WinPrAsn1EncContextualOctetString(enc, 0, &octet_string);
free(octet_string.data); free(octet_string.data);
if (!ret) if (!res)
goto out; goto out;
/* cspData [1] SEQUENCE */ /* cspData [1] SEQUENCE */

1
libfreerdp/core/peer.c
View File

@ -609,7 +609,6 @@ static state_run_t peer_recv_handle_licensing(freerdp_peer* client, wStream* s)
{ {
case LICENSE_STATE_INITIAL: case LICENSE_STATE_INITIAL:
{ {
const rdpSettings* settings = rdp->settings;
const BOOL required = const BOOL required =
freerdp_settings_get_bool(settings, FreeRDP_ServerLicenseRequired); freerdp_settings_get_bool(settings, FreeRDP_ServerLicenseRequired);