Fixed compilation warnings.
This commit is contained in:
parent
cda41b8d07
commit
59b4988f56
@ -1215,8 +1215,6 @@ static LONG smartcard_StatusW_Call(SMARTCARD_DEVICE* smartcard, SMARTCARD_OPERAT
|
|||||||
*/
|
*/
|
||||||
cbAtrLen = call->cbAtrLen = 32;
|
cbAtrLen = call->cbAtrLen = 32;
|
||||||
|
|
||||||
call->cchReaderLen;
|
|
||||||
|
|
||||||
if (call->fmszReaderNamesIsNULL)
|
if (call->fmszReaderNamesIsNULL)
|
||||||
cchReaderLen = 0;
|
cchReaderLen = 0;
|
||||||
else
|
else
|
||||||
|
@ -489,7 +489,6 @@ static BOOL region16_simplify_bands(REGION16* region)
|
|||||||
|
|
||||||
BOOL region16_union_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* rect)
|
BOOL region16_union_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* rect)
|
||||||
{
|
{
|
||||||
REGION16_DATA* data;
|
|
||||||
const RECTANGLE_16* srcExtents;
|
const RECTANGLE_16* srcExtents;
|
||||||
RECTANGLE_16* dstExtents;
|
RECTANGLE_16* dstExtents;
|
||||||
const RECTANGLE_16* currentBand, *endSrcRect, *nextBand;
|
const RECTANGLE_16* currentBand, *endSrcRect, *nextBand;
|
||||||
@ -727,7 +726,6 @@ BOOL region16_intersects_rect(const REGION16* src, const RECTANGLE_16* arg2)
|
|||||||
|
|
||||||
BOOL region16_intersect_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* rect)
|
BOOL region16_intersect_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* rect)
|
||||||
{
|
{
|
||||||
REGION16_DATA* data;
|
|
||||||
REGION16_DATA* newItems;
|
REGION16_DATA* newItems;
|
||||||
const RECTANGLE_16* srcPtr, *endPtr, *srcExtents;
|
const RECTANGLE_16* srcPtr, *endPtr, *srcExtents;
|
||||||
RECTANGLE_16* dstPtr;
|
RECTANGLE_16* dstPtr;
|
||||||
|
@ -2999,7 +2999,7 @@ static BOOL rdp_write_nsc_client_capability_container(wStream* s,
|
|||||||
|
|
||||||
#if defined(WITH_JPEG)
|
#if defined(WITH_JPEG)
|
||||||
static BOOL rdp_write_jpeg_client_capability_container(wStream* s,
|
static BOOL rdp_write_jpeg_client_capability_container(wStream* s,
|
||||||
rdpSettings* settings)
|
const rdpSettings* settings)
|
||||||
{
|
{
|
||||||
if (!Stream_EnsureRemainingCapacity(s, 8))
|
if (!Stream_EnsureRemainingCapacity(s, 8))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@ -3027,7 +3027,7 @@ static BOOL rdp_write_rfx_server_capability_container(wStream* s,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static BOOL rdp_write_jpeg_server_capability_container(wStream* s,
|
static BOOL rdp_write_jpeg_server_capability_container(wStream* s,
|
||||||
rdpSettings* settings)
|
const rdpSettings* settings)
|
||||||
{
|
{
|
||||||
if (!Stream_EnsureRemainingCapacity(s, 8))
|
if (!Stream_EnsureRemainingCapacity(s, 8))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -141,7 +141,7 @@ static void license_print_product_info(const LICENSE_PRODUCT_INFO* productInfo)
|
|||||||
|
|
||||||
static void license_print_scope_list(const SCOPE_LIST* scopeList)
|
static void license_print_scope_list(const SCOPE_LIST* scopeList)
|
||||||
{
|
{
|
||||||
int index;
|
UINT32 index;
|
||||||
const LICENSE_BLOB* scope;
|
const LICENSE_BLOB* scope;
|
||||||
WLog_INFO(TAG, "ScopeList (%"PRIu32"):", scopeList->count);
|
WLog_INFO(TAG, "ScopeList (%"PRIu32"):", scopeList->count);
|
||||||
|
|
||||||
|
@ -33,8 +33,8 @@
|
|||||||
#define CONFIG_PRINT_SECTION(section) WLog_INFO(TAG, "\t%s:", section)
|
#define CONFIG_PRINT_SECTION(section) WLog_INFO(TAG, "\t%s:", section)
|
||||||
#define CONFIG_PRINT_STR(config, key) WLog_INFO(TAG, "\t\t%s: %s", #key, config->key)
|
#define CONFIG_PRINT_STR(config, key) WLog_INFO(TAG, "\t\t%s: %s", #key, config->key)
|
||||||
#define CONFIG_PRINT_BOOL(config, key) WLog_INFO(TAG, "\t\t%s: %s", #key, config->key ? "TRUE" : "FALSE")
|
#define CONFIG_PRINT_BOOL(config, key) WLog_INFO(TAG, "\t\t%s: %s", #key, config->key ? "TRUE" : "FALSE")
|
||||||
#define CONFIG_PRINT_UINT16(config, key) WLog_INFO(TAG, "\t\t%s: %"PRIu16"", #key, config->key);
|
#define CONFIG_PRINT_UINT16(config, key) WLog_INFO(TAG, "\t\t%s: %"PRIu16"", #key, config->key)
|
||||||
#define CONFIG_PRINT_UINT32(config, key) WLog_INFO(TAG, "\t\t%s: %"PRIu32"", #key, config->key);
|
#define CONFIG_PRINT_UINT32(config, key) WLog_INFO(TAG, "\t\t%s: %"PRIu32"", #key, config->key)
|
||||||
|
|
||||||
static BOOL pf_config_get_uint16(wIniFile* ini, const char* section, const char* key, UINT16* result)
|
static BOOL pf_config_get_uint16(wIniFile* ini, const char* section, const char* key, UINT16* result)
|
||||||
{
|
{
|
||||||
@ -56,7 +56,7 @@ static BOOL pf_config_get_uint32(wIniFile* ini, const char* section, const char*
|
|||||||
int val;
|
int val;
|
||||||
|
|
||||||
val = IniFile_GetKeyValueInt(ini, section, key);
|
val = IniFile_GetKeyValueInt(ini, section, key);
|
||||||
if ((val < 0) || (val > UINT32_MAX))
|
if ((val < 0) || (val > INT32_MAX))
|
||||||
{
|
{
|
||||||
WLog_ERR(TAG, "pf_config_get_uint32(): invalid value %d for section '%s', key '%s'!", val, section, key);
|
WLog_ERR(TAG, "pf_config_get_uint32(): invalid value %d for section '%s', key '%s'!", val, section, key);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@ -126,7 +126,7 @@ static BOOL pf_config_load_clipboard(wIniFile* ini, proxyConfig* config)
|
|||||||
|
|
||||||
static BOOL pf_config_load_modules(wIniFile* ini, proxyConfig* config)
|
static BOOL pf_config_load_modules(wIniFile* ini, proxyConfig* config)
|
||||||
{
|
{
|
||||||
UINT32 index;
|
int index;
|
||||||
int modules_count = 0;
|
int modules_count = 0;
|
||||||
char** module_names = NULL;
|
char** module_names = NULL;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user