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

Fixed Wshadow warnings

Browse Source
This commit is contained in:
akallabeth 2022-11-14 11:17:43 +01:00 committed by Bernhard Miklautz
parent 7894cf545c
commit 7e1065a9b9
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/cliprdr/cliprdr_common.c
View File

@ -475,8 +475,6 @@ UINT cliprdr_read_format_list(wStream* s, CLIPRDR_FORMAT_LIST* formatList, BOOL
{
if (wszFormatName[0])
{
CLIPRDR_FORMAT* format = &formats[index];
format->formatName = ConvertWCharNToUtf8Alloc(wszFormatName, 16, NULL);
if (!format->formatName)
goto error_out;

1
channels/tsmf/client/tsmf_media.c
View File

@ -691,7 +691,6 @@ static BOOL tsmf_sample_playback(TSMF_SAMPLE* sample)
}
else
{
TSMF_STREAM* stream = sample->stream;
UINT64 ack_anticipation_time = get_current_time();
BOOL buffer_filled = TRUE;

9
libfreerdp/core/nla.c
View File

@ -1162,7 +1162,6 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla)
{ 3, FreeRDP_ContainerName },
{ 4, FreeRDP_CspName } };
WinPrAsn1_OctetString octet_string = { 0 };
BOOL ret;
/* TSSmartCardCreds */
if (!WinPrAsn1EncSeqContainer(enc))
@ -1173,9 +1172,9 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla)
octet_string.data =
(BYTE*)freerdp_settings_get_string_as_utf16(settings, FreeRDP_Password, &s);
octet_string.len = s * sizeof(WCHAR);
ret = WinPrAsn1EncContextualOctetString(enc, 0, &octet_string) > 0;
const BOOL res = WinPrAsn1EncContextualOctetString(enc, 0, &octet_string) > 0;
free(octet_string.data);
if (!ret)
if (!res)
goto out;
/* cspData [1] SEQUENCE */
@ -1196,10 +1195,10 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla)
octet_string.len = len * sizeof(WCHAR);
if (octet_string.len)
{
ret = WinPrAsn1EncContextualOctetString(enc, cspData_fields[i].tag, &octet_string) >
const BOOL res2 = WinPrAsn1EncContextualOctetString(enc, cspData_fields[i].tag, &octet_string) >
0;
free(octet_string.data);
if (!ret)
if (!res2)
goto out;
}
}