From 36b8f54c5e7ade310febc8d0c4c03ba75167daa5 Mon Sep 17 00:00:00 2001 From: Norbert Federa Date: Mon, 10 Jul 2017 15:29:09 +0200 Subject: [PATCH] Fixed a few compiler warnings --- channels/drive/client/drive_file.c | 2 +- channels/drive/client/drive_main.c | 2 +- client/X11/xf_gfx.c | 2 +- client/common/cmdline.c | 3 +- libfreerdp/core/update.c | 1 + .../primitives/test/TestPrimitivesColors.c | 2 +- .../synch/test/TestSynchMultipleThreads.c | 44 +++++++++---------- .../sysinfo/test/TestGetComputerName.c | 2 +- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/channels/drive/client/drive_file.c b/channels/drive/client/drive_file.c index 6dabb29fb..65586e994 100644 --- a/channels/drive/client/drive_file.c +++ b/channels/drive/client/drive_file.c @@ -181,7 +181,7 @@ static BOOL drive_file_remove_dir(const WCHAR* path) return ret; } -static void drive_file_set_fullpath(DRIVE_FILE* file, const WCHAR* fullpath) +static void drive_file_set_fullpath(DRIVE_FILE* file, WCHAR* fullpath) { free(file->fullpath); file->fullpath = fullpath; diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c index 48e5b97c2..e873ff954 100644 --- a/channels/drive/client/drive_main.c +++ b/channels/drive/client/drive_main.c @@ -866,7 +866,7 @@ UINT drive_register_drive_path(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, return CHANNEL_RC_OK; out_error: - drive_free(drive); + drive_free((DEVICE*) drive); return error; } diff --git a/client/X11/xf_gfx.c b/client/X11/xf_gfx.c index a6a85b578..ff685e380 100644 --- a/client/X11/xf_gfx.c +++ b/client/X11/xf_gfx.c @@ -295,7 +295,7 @@ static UINT xf_CreateSurface(RdpgfxClientContext* context, surface->gdi.outputMapped = FALSE; region16_init(&surface->gdi.invalidRegion); - if (context->SetSurfaceData(context, surface->gdi.surfaceId, (void*) surface) < 0) + if (context->SetSurfaceData(context, surface->gdi.surfaceId, (void*) surface) != CHANNEL_RC_OK) { WLog_ERR(TAG, "%s: an error occurred during SetSurfaceData", __FUNCTION__); goto error_set_surface_data; diff --git a/client/common/cmdline.c b/client/common/cmdline.c index 12a4df5e4..937db5274 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -2432,8 +2432,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings, { settings->AutoReconnectMaxRetries = atoi(arg->Value); - if ((settings->AutoReconnectMaxRetries < 0) || - (settings->AutoReconnectMaxRetries > 1000)) + if (settings->AutoReconnectMaxRetries > 1000) return COMMAND_LINE_ERROR; } CommandLineSwitchCase(arg, "reconnect-cookie") diff --git a/libfreerdp/core/update.c b/libfreerdp/core/update.c index b5a742f55..245fc3b6e 100644 --- a/libfreerdp/core/update.c +++ b/libfreerdp/core/update.c @@ -33,6 +33,7 @@ #include "surface.h" #include "message.h" #include "info.h" +#include "window.h" #include #include diff --git a/libfreerdp/primitives/test/TestPrimitivesColors.c b/libfreerdp/primitives/test/TestPrimitivesColors.c index 820ea8603..1b9b6b1a3 100644 --- a/libfreerdp/primitives/test/TestPrimitivesColors.c +++ b/libfreerdp/primitives/test/TestPrimitivesColors.c @@ -102,7 +102,7 @@ static BOOL test_RGBToRGB_16s8u_P3AC4R_func(prim_size_t roi, DWORD DstFormat) } } - printf("Results for %lux%lu [%s]", roi.width, roi.height, GetColorFormatName(DstFormat)); + printf("Results for %"PRIu32"x%"PRIu32" [%s]", roi.width, roi.height, GetColorFormatName(DstFormat)); PROFILER_PRINT_HEADER; PROFILER_PRINT(genericProf); PROFILER_PRINT(optProf); diff --git a/winpr/libwinpr/synch/test/TestSynchMultipleThreads.c b/winpr/libwinpr/synch/test/TestSynchMultipleThreads.c index d94b95527..d752c3294 100644 --- a/winpr/libwinpr/synch/test/TestSynchMultipleThreads.c +++ b/winpr/libwinpr/synch/test/TestSynchMultipleThreads.c @@ -58,103 +58,103 @@ int TestSynchMultipleThreads(int argc, char *argv[]) /* WaitForAll, timeout */ if (start_threads(THREADS, threads)) - return -1; + return 1; if (WaitForMultipleObjects(THREADS, threads, TRUE, 50) != WAIT_TIMEOUT) { printf("WaitForMultipleObjects bWaitAll, timeout 50 failed\n"); - rc = -1; + rc = 2; } if (WaitForMultipleObjects(THREADS, threads, TRUE, INFINITE) != WAIT_OBJECT_0) { printf("WaitForMultipleObjects bWaitAll, INFINITE failed\n"); - rc = -1; + rc = 3; } if (close_threads(THREADS, threads)) - return -1; + return 4; /* WaitOne, infinite */ if (rc) return rc; if (start_threads(THREADS, threads)) - return -1; + return 5; ev = WaitForMultipleObjects(THREADS, threads, FALSE, INFINITE); if ((ev < WAIT_OBJECT_0) || (ev > (WAIT_OBJECT_0 + THREADS))) { printf("WaitForMultipleObjects INFINITE failed\n"); - rc = -1; + rc = 6; } if (WaitForMultipleObjects(THREADS, threads, TRUE, INFINITE) != WAIT_OBJECT_0) { printf("WaitForMultipleObjects bWaitAll, INFINITE failed\n"); - rc = -1; + rc = 7; } if (close_threads(THREADS, threads)) - return -1; + return 8; if (rc) return rc; /* WaitOne, timeout */ if (start_threads(THREADS, threads)) - return -1; + return 9; if (WaitForMultipleObjects(THREADS, threads, FALSE, 50) != WAIT_TIMEOUT) { printf("WaitForMultipleObjects timeout 50 failed\n"); - rc = -1; + rc = 10; } if (WaitForMultipleObjects(THREADS, threads, TRUE, INFINITE) != WAIT_OBJECT_0) { printf("WaitForMultipleObjects bWaitAll, INFINITE failed\n"); - rc = -1; + rc = 11; } if (close_threads(THREADS, threads)) - return -1; + return 12; - if (rc < 0) - return rc; + if (rc) + return 13; /* WaitOne, timeout, multiple joins */ if (start_threads(THREADS, threads)) - return -1; + return 14; - for (i=0; i