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

Fixed compiler warnings, function arguments and const parameter

Browse Source
This commit is contained in:
Armin Novak 2021-05-18 12:16:21 +02:00 committed by akallabeth
parent 80d7f206af
commit 2b19576fc7
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/common/file.c
View File

@ -2034,7 +2034,7 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
free(args); free(args);
return FALSE; return FALSE;
} }
list = freerdp_settings_get_pointer(settings, FreeRDP_MonitorIds); list = freerdp_settings_get_pointer_writable(settings, FreeRDP_MonitorIds);
if (!list && (count > 0)) if (!list && (count > 0))
{ {
free(args); free(args);

2
client/common/test/TestClientRdpFile.c
View File

@ -401,7 +401,7 @@ int TestClientRdpFile(int argc, char* argv[])
printf("desktopscalefactor uses invalid default value %d", iValue); printf("desktopscalefactor uses invalid default value %d", iValue);
goto fail; goto fail;
} }
if (freerdp_settings_get_uint32(settings, FreeRDP_DesktopScaleFactor) != iValue) if ((INT64)freerdp_settings_get_uint32(settings, FreeRDP_DesktopScaleFactor) != iValue)
{ {
printf("FreeRDP_DesktopScaleFactor has invalid value"); printf("FreeRDP_DesktopScaleFactor has invalid value");
goto fail; goto fail;

2
include/freerdp/settings.h
View File

@ -1650,7 +1650,7 @@ extern "C"
ADDIN_ARGV* channel); ADDIN_ARGV* channel);
FREERDP_API BOOL freerdp_dynamic_channel_collection_del(rdpSettings* settings, FREERDP_API BOOL freerdp_dynamic_channel_collection_del(rdpSettings* settings,
const char* name); const char* name);
FREERDP_API ADDIN_ARGV* freerdp_dynamic_channel_collection_find(rdpSettings* settings, FREERDP_API ADDIN_ARGV* freerdp_dynamic_channel_collection_find(const rdpSettings* settings,
const char* name); const char* name);
FREERDP_API WINPR_DEPRECATED(ADDIN_ARGV* freerdp_dynamic_channel_clone(ADDIN_ARGV* channel)); FREERDP_API WINPR_DEPRECATED(ADDIN_ARGV* freerdp_dynamic_channel_clone(ADDIN_ARGV* channel));

2
libfreerdp/codec/progressive.c
View File

@ -2158,7 +2158,7 @@ INT32 progressive_decompress(PROGRESSIVE_CONTEXT* progressive, const BYTE* pSrcD
UINT32 frameId) UINT32 frameId)
{ {
INT32 rc = 1; INT32 rc = 1;
UINT32 i, j; UINT32 i;
UINT16 blockType; UINT16 blockType;
UINT32 blockLen; UINT32 blockLen;
UINT32 count = 0; UINT32 count = 0;

4
libfreerdp/common/settings.c
View File

@ -621,7 +621,7 @@ BOOL freerdp_dynamic_channel_collection_add(rdpSettings* settings, ADDIN_ARGV* c
return freerdp_settings_set_uint32(settings, FreeRDP_DynamicChannelCount, count); return freerdp_settings_set_uint32(settings, FreeRDP_DynamicChannelCount, count);
} }
ADDIN_ARGV* freerdp_dynamic_channel_collection_find(rdpSettings* settings, const char* name) ADDIN_ARGV* freerdp_dynamic_channel_collection_find(const rdpSettings* settings, const char* name)
{ {
UINT32 index; UINT32 index;
ADDIN_ARGV* channel; ADDIN_ARGV* channel;
@ -1055,7 +1055,7 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, size_t id, const vo
{ {
case FreeRDP_RdpServerCertificate: case FreeRDP_RdpServerCertificate:
certificate_free(settings->RdpServerCertificate); certificate_free(settings->RdpServerCertificate);
settings->RdpServerCertificate = data; settings->RdpServerCertificate = (rdpCertificate*)data;
return TRUE; return TRUE;
case FreeRDP_RdpServerRsaKey: case FreeRDP_RdpServerRsaKey:
key_free(settings->RdpServerRsaKey); key_free(settings->RdpServerRsaKey);

2
libfreerdp/crypto/certificate.c
View File

@ -1069,7 +1069,7 @@ rdpCertificateStore* certificate_store_new(const rdpSettings* settings)
if (!certificate_store_init(certificate_store)) if (!certificate_store_init(certificate_store))
{ {
certificate_data_free(certificate_store); certificate_store_free(certificate_store);
return NULL; return NULL;
} }

2
libfreerdp/crypto/tls.c
View File

@ -1373,7 +1373,7 @@ int tls_verify_certificate(rdpTls* tls, CryptoCert cert, const char* hostname, U
size_t length = 0; size_t length = 0;
char* issuer = crypto_cert_issuer(cert->px509); char* issuer = crypto_cert_issuer(cert->px509);
char* subject = crypto_cert_subject(cert->px509); char* subject = crypto_cert_subject(cert->px509);
char* pem = crypto_cert_pem(cert->px509, NULL, &length); char* pem = (char*)crypto_cert_pem(cert->px509, NULL, &length);
if (!pem) if (!pem)
goto end; goto end;