From 52fbfb7b1268749c2e5947542ffdd9c395b99305 Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Tue, 29 Aug 2017 09:09:38 +0200 Subject: [PATCH] fix clang warnings, directly include wtypes.h (#4097) * build: clang use -Wno-unused-command-line-argument With clang 5.0 builds are quite noisy otherwise. * Directly include wtypes.h Directly include winpr/wtypes.h where _fseeki64 or _ftelli64 is used. * fix build warnings with clang 5 clang version: 5.0.0-svn310678-1~exp1 (branches/release_50) Warning: parentheses-equality * fix build warnings with clang 5 clang version: 5.0.0-svn310678-1~exp1 (branches/release_50) Warning: tautological-compare * fix build warnings with clang 5 clang version: 5.0.0-svn310678-1~exp1 (branches/release_50) Warning: incompatible pointer types passing 'size_t *' (aka 'unsigned long *') to parameter of type 'UINT32 *' (aka 'unsigned int *') [-Wincompatible-pointer-types] --- CMakeLists.txt | 1 + channels/tsmf/client/gstreamer/tsmf_X11.c | 8 ++++++++ channels/tsmf/client/gstreamer/tsmf_gstreamer.c | 8 ++++++++ client/common/file.c | 2 +- libfreerdp/codec/bitmap.c | 12 ++++++------ libfreerdp/codec/ncrush.c | 2 +- libfreerdp/codec/test/TestFreeRDPCodecProgressive.c | 3 ++- libfreerdp/common/assistance.c | 1 + libfreerdp/core/certificate.c | 1 + libfreerdp/primitives/test/TestPrimitivesAlphaComp.c | 8 ++++---- libfreerdp/utils/pcap.c | 1 + rdtk/librdtk/rdtk_font.c | 1 + winpr/libwinpr/file/file.c | 1 + winpr/libwinpr/registry/registry_reg.c | 1 + winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c | 1 + winpr/libwinpr/timezone/timezone.c | 1 + winpr/libwinpr/utils/image.c | 1 + winpr/libwinpr/utils/ini.c | 1 + winpr/libwinpr/utils/sam.c | 1 + winpr/libwinpr/utils/test/TestImage.c | 1 + winpr/libwinpr/utils/wlog/PacketMessage.c | 1 + 21 files changed, 44 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7e9929ba..1b3b86f67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -283,6 +283,7 @@ if(${CMAKE_C_COMPILER_ID} STREQUAL "Clang") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-macros -Wno-padded") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-c11-extensions -Wno-gnu") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-command-line-argument") if(WITH_SSE2) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mssse3") endif() diff --git a/channels/tsmf/client/gstreamer/tsmf_X11.c b/channels/tsmf/client/gstreamer/tsmf_X11.c index 3f6002a93..b57b92729 100644 --- a/channels/tsmf/client/gstreamer/tsmf_X11.c +++ b/channels/tsmf/client/gstreamer/tsmf_X11.c @@ -33,7 +33,15 @@ #include #include +#if __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wparentheses-equality" +#endif /* __clang__ */ #include +#if __clang__ +#pragma clang diagnostic pop +#endif /* __clang__ */ + #if GST_VERSION_MAJOR > 0 #include #else diff --git a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c index bd22e6a3f..0addbe766 100644 --- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c +++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c @@ -33,7 +33,15 @@ #include +#if __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wparentheses-equality" +#endif /* __clang__ */ #include +#if __clang__ +#pragma clang diagnostic pop +#endif /* __clang__ */ + #include #include diff --git a/client/common/file.c b/client/common/file.c index 8eb0ae132..ac39697bf 100644 --- a/client/common/file.c +++ b/client/common/file.c @@ -21,7 +21,6 @@ #include "config.h" #endif - #include #include @@ -41,6 +40,7 @@ #include #endif +#include #include #include #define TAG CLIENT_TAG("common") diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c index aeb8e9381..7cf4512d8 100644 --- a/libfreerdp/codec/bitmap.c +++ b/libfreerdp/codec/bitmap.c @@ -435,8 +435,8 @@ #define TEST_MIX \ ((last_line == 0 && pixel == mix) || \ (last_line != 0 && pixel == (ypixel ^ mix))) -#define TEST_FOM (TEST_FILL || TEST_MIX) -#define TEST_COLOR (pixel == last_pixel) +#define TEST_FOM TEST_FILL || TEST_MIX +#define TEST_COLOR pixel == last_pixel #define TEST_BICOLOR \ ( \ (pixel != last_pixel) && \ @@ -559,7 +559,7 @@ int freerdp_bitmap_compress(const char* srcData, int width, int height, mix_count = 0; } - if (!TEST_COLOR) + if (!(TEST_COLOR)) { if (color_count > 3 && color_count >= fill_count && @@ -607,7 +607,7 @@ int freerdp_bitmap_compress(const char* srcData, int width, int height, bicolor_spin = 0; } - if (!TEST_FOM) + if (!(TEST_FOM)) { if (fom_count > 3 && fom_count >= fill_count && @@ -852,7 +852,7 @@ int freerdp_bitmap_compress(const char* srcData, int width, int height, mix_count = 0; } - if (!TEST_COLOR) + if (!(TEST_COLOR)) { if (color_count > 3 && color_count >= fill_count && @@ -900,7 +900,7 @@ int freerdp_bitmap_compress(const char* srcData, int width, int height, bicolor_spin = 0; } - if (!TEST_FOM) + if (!(TEST_FOM)) { if (fom_count > 3 && fom_count >= fill_count && diff --git a/libfreerdp/codec/ncrush.c b/libfreerdp/codec/ncrush.c index d841c2717..2b22baec0 100644 --- a/libfreerdp/codec/ncrush.c +++ b/libfreerdp/codec/ncrush.c @@ -1767,7 +1767,7 @@ int ncrush_decompress(NCRUSH_CONTEXT* ncrush, BYTE* pSrcData, UINT32 SrcSize, BY { UINT32 index; UINT32 bits; - UINT32 nbits; + INT32 nbits; BYTE* SrcPtr; BYTE* SrcEnd; UINT16 Mask; diff --git a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c index 789291c97..e99c55a92 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c @@ -1,3 +1,4 @@ +#include #include #include #include @@ -483,7 +484,7 @@ static int test_progressive_load_files(char* ms_sample_path, EGFX_SAMPLE_FILE fi return 1; } -static BYTE* test_progressive_load_bitmap(char* path, char* file, UINT32* size, int quarter) +static BYTE* test_progressive_load_bitmap(char* path, char* file, size_t* size, int quarter) { int status; BYTE* buffer; diff --git a/libfreerdp/common/assistance.c b/libfreerdp/common/assistance.c index 660add7e6..22248f636 100644 --- a/libfreerdp/common/assistance.c +++ b/libfreerdp/common/assistance.c @@ -21,6 +21,7 @@ #include "config.h" #endif +#include #include #include #include diff --git a/libfreerdp/core/certificate.c b/libfreerdp/core/certificate.c index 4338d0d87..2ce8057df 100644 --- a/libfreerdp/core/certificate.c +++ b/libfreerdp/core/certificate.c @@ -28,6 +28,7 @@ #include #include +#include #include #include diff --git a/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c b/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c index 4073197eb..92fe2c9a8 100644 --- a/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c +++ b/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c @@ -75,19 +75,19 @@ static UINT32 colordist( UINT32 c2) { int d, maxd = 0; - d = ABS(ALF(c1) - ALF(c2)); + d = ABS((INT32)(ALF(c1) - ALF(c2))); if (d > maxd) maxd = d; - d = ABS(RED(c1) - RED(c2)); + d = ABS((INT32)(RED(c1) - RED(c2))); if (d > maxd) maxd = d; - d = ABS(GRN(c1) - GRN(c2)); + d = ABS((INT32)(GRN(c1) - GRN(c2))); if (d > maxd) maxd = d; - d = ABS(BLU(c1) - BLU(c2)); + d = ABS((INT32)(BLU(c1) - BLU(c2))); if (d > maxd) maxd = d; diff --git a/libfreerdp/utils/pcap.c b/libfreerdp/utils/pcap.c index 603114eb6..11a277bad 100644 --- a/libfreerdp/utils/pcap.c +++ b/libfreerdp/utils/pcap.c @@ -25,6 +25,7 @@ #include #include +#include #include #include diff --git a/rdtk/librdtk/rdtk_font.c b/rdtk/librdtk/rdtk_font.c index e09a3afae..aac7f3ea0 100644 --- a/rdtk/librdtk/rdtk_font.c +++ b/rdtk/librdtk/rdtk_font.c @@ -20,6 +20,7 @@ #include "config.h" #endif +#include #include #include #include diff --git a/winpr/libwinpr/file/file.c b/winpr/libwinpr/file/file.c index 702a3a84b..1b17f7305 100644 --- a/winpr/libwinpr/file/file.c +++ b/winpr/libwinpr/file/file.c @@ -23,6 +23,7 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ +#include #include #include diff --git a/winpr/libwinpr/registry/registry_reg.c b/winpr/libwinpr/registry/registry_reg.c index 78e934188..ac9bc8dfb 100644 --- a/winpr/libwinpr/registry/registry_reg.c +++ b/winpr/libwinpr/registry/registry_reg.c @@ -25,6 +25,7 @@ #include #include +#include #include #include "registry_reg.h" diff --git a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c index adff1d7b1..acdfa3417 100644 --- a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c +++ b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c @@ -71,6 +71,7 @@ #include #include #include +#include static pthread_once_t g_once; static int g_inited; diff --git a/winpr/libwinpr/timezone/timezone.c b/winpr/libwinpr/timezone/timezone.c index 9844d1efd..5163154e3 100644 --- a/winpr/libwinpr/timezone/timezone.c +++ b/winpr/libwinpr/timezone/timezone.c @@ -21,6 +21,7 @@ #include "config.h" #endif +#include #include #include #include "../log.h" diff --git a/winpr/libwinpr/utils/image.c b/winpr/libwinpr/utils/image.c index 0af42557a..ce87e7656 100644 --- a/winpr/libwinpr/utils/image.c +++ b/winpr/libwinpr/utils/image.c @@ -23,6 +23,7 @@ #include "config.h" #endif +#include #include #include diff --git a/winpr/libwinpr/utils/ini.c b/winpr/libwinpr/utils/ini.c index 6edd6f4d0..112a6c5ca 100644 --- a/winpr/libwinpr/utils/ini.c +++ b/winpr/libwinpr/utils/ini.c @@ -25,6 +25,7 @@ #include #include +#include #include #include diff --git a/winpr/libwinpr/utils/sam.c b/winpr/libwinpr/utils/sam.c index 5e20d78df..f9287e936 100644 --- a/winpr/libwinpr/utils/sam.c +++ b/winpr/libwinpr/utils/sam.c @@ -25,6 +25,7 @@ #include #include +#include #include #include #include diff --git a/winpr/libwinpr/utils/test/TestImage.c b/winpr/libwinpr/utils/test/TestImage.c index 50b5181a2..08937651c 100644 --- a/winpr/libwinpr/utils/test/TestImage.c +++ b/winpr/libwinpr/utils/test/TestImage.c @@ -1,3 +1,4 @@ +#include #include #include #include diff --git a/winpr/libwinpr/utils/wlog/PacketMessage.c b/winpr/libwinpr/utils/wlog/PacketMessage.c index 202a7ca8d..abd3038a5 100644 --- a/winpr/libwinpr/utils/wlog/PacketMessage.c +++ b/winpr/libwinpr/utils/wlog/PacketMessage.c @@ -27,6 +27,7 @@ #include "wlog/PacketMessage.h" +#include #include #include