From 0b1406d65c1365bce9296bffb13fffc5c51a3227 Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Sat, 6 May 2017 05:22:28 -0700 Subject: [PATCH] IOT-1583: Removing /W4 warnings - part 6. Removing remaining /W4 warnings and enabling /W4 along with /WX globally. Change-Id: I521f17e36038e0cc74c14afbb7e6a7a2cee6c45e Signed-off-by: Pawel Winogrodzki Reviewed-on: https://gerrit.iotivity.org/gerrit/19691 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai --- build_common/windows/SConscript | 4 ++-- extlibs/cjson/SConscript | 2 -- extlibs/gtest/SConscript | 1 - extlibs/libcoap/SConscript | 3 --- extlibs/mbedtls/SConscript | 3 --- extlibs/sqlite3/SConscript | 1 - resource/IPCA/SConscript | 3 --- resource/IPCA/unittests/SConscript | 3 --- resource/c_common/SConscript | 7 ------- resource/c_common/unittests/SConscript | 4 ---- resource/csdk/connectivity/SConscript | 3 --- resource/csdk/connectivity/test/SConscript | 3 --- resource/csdk/resource-directory/src/rd_server.c | 4 +++- resource/csdk/security/SConscript | 2 -- resource/csdk/security/unittests/SConscript | 3 --- resource/csdk/stack/SConscript | 2 -- resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp | 2 ++ .../csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp | 2 ++ resource/csdk/stack/test/SConscript | 7 +------ 19 files changed, 10 insertions(+), 49 deletions(-) diff --git a/build_common/windows/SConscript b/build_common/windows/SConscript index 5fcdb86..5a7e751 100644 --- a/build_common/windows/SConscript +++ b/build_common/windows/SConscript @@ -41,8 +41,8 @@ if env['CC'] == 'cl': # - Disabled due to the widespread usage in IoTivity and low impact. env.AppendUnique(CCFLAGS=['/wd4127', '/wd4200', '/wd4201', '/wd4204', '/wd4214', '/wd4221', '/wd4232', '/wd4503', '/wd4512', '/wd4706']) - # Enabling /W3 warnings globally for Windows builds. - env.AppendUnique(CCFLAGS=['/W3', '/WX']) + # Enabling /W4 warnings globally for Windows builds. + env.AppendUnique(CCFLAGS=['/W4', '/WX']) env.AppendUnique(CCFLAGS=['/EHsc']) # Set release/debug flags diff --git a/extlibs/cjson/SConscript b/extlibs/cjson/SConscript index 58d2872..4f17642 100644 --- a/extlibs/cjson/SConscript +++ b/extlibs/cjson/SConscript @@ -25,8 +25,6 @@ cjson_env = env.Clone() if cjson_env.get('TARGET_OS') in ['windows', 'msys_nt']: # Macro needed for Windows builds to avoid __declspec(dllexport) and __declspec(dllimport) for cJSON APIs. cjson_env.AppendUnique(CPPDEFINES = ['CJSON_HIDE_SYMBOLS']) - if cjson_env['CC'] == 'cl': - cjson_env.AppendUnique(CCFLAGS = ['/W4']) libcjson = cjson_env.StaticLibrary('cjson', ['cJSON.c'], OBJPREFIX='libcjson_') cjson_env.InstallTarget(libcjson, 'cjson'); diff --git a/extlibs/gtest/SConscript b/extlibs/gtest/SConscript index 7bbdc8d..73b3329 100644 --- a/extlibs/gtest/SConscript +++ b/extlibs/gtest/SConscript @@ -78,7 +78,6 @@ elif target_os in ['windows']: gtest_build_env = gtest_env.Clone() gtest_build_env.AppendUnique(CPPPATH = [ os.path.join(gtest_dir, 'include') ]) gtest_build_env.AppendUnique(CXXFLAGS = ['/EHsc']) - gtest_build_env.AppendUnique(CCFLAGS = ['/W4']) gtest = gtest_build_env.StaticLibrary(target = 'gtest', source = [ '%s/src/gtest-all.cc' % gtest_dir ]) gtest_main = gtest_build_env.StaticLibrary(target = 'gtest_main', source = [ '%s/src/gtest_main.cc' % gtest_dir ]) gtest_env.InstallTarget(gtest, 'gtest') diff --git a/extlibs/libcoap/SConscript b/extlibs/libcoap/SConscript index 8aa912d..8f1335b 100644 --- a/extlibs/libcoap/SConscript +++ b/extlibs/libcoap/SConscript @@ -316,9 +316,6 @@ else: libcoap_src_root = src_dir + '/resource/csdk/connectivity/lib/libcoap-4.1.1' libcoap_src = glob.glob(os.path.join(libcoap_src_root, '*.c')) -if libcoap_env['CC'] == 'cl': - libcoap_env.AppendUnique(CCFLAGS = ['/W4']) - libcoap = libcoap_env.StaticLibrary('coap', libcoap_src, OBJPREFIX='libcoap_') Clean(libcoap, config_h_file_path) diff --git a/extlibs/mbedtls/SConscript b/extlibs/mbedtls/SConscript index ec5749d..420dc9a 100644 --- a/extlibs/mbedtls/SConscript +++ b/extlibs/mbedtls/SConscript @@ -120,9 +120,6 @@ else: mbedtls_env = env.Clone() -if mbedtls_env['CC'] == 'cl': - mbedtls_env.AppendUnique(CCFLAGS = ['/W4']) - mbedtls_env.AppendUnique(CPPPATH = [ mbedtls_dir, os.path.join(mbedtls_dir, 'include'), diff --git a/extlibs/sqlite3/SConscript b/extlibs/sqlite3/SConscript index 0117ee4..73498cd 100755 --- a/extlibs/sqlite3/SConscript +++ b/extlibs/sqlite3/SConscript @@ -40,7 +40,6 @@ if target_os in targets_need_sqlite: shutil.rmtree(sqlite_tmp_dir) if target_os in ['windows']: - sqlite_env.AppendUnique(CCFLAGS = ['/W4']) if sqlite_env.get('UWP_APP') == '1': sqlite_env.AppendUnique(CPPDEFINES=['SQLITE_OS_WINRT']) libsqlite3 = sqlite_env.StaticLibrary('sqlite3', sqlite_c) diff --git a/resource/IPCA/SConscript b/resource/IPCA/SConscript index 4769d03..27ef034 100644 --- a/resource/IPCA/SConscript +++ b/resource/IPCA/SConscript @@ -27,9 +27,6 @@ Import('env') ipca_env = env.Clone() -if ipca_env['CC'] == 'cl': - ipca_env.AppendUnique(CCFLAGS=['/W4']) - # c_common calls into mbedcrypto and ipca calls into c_common ipca_env.AppendUnique(LIBS = ['mbedcrypto']) diff --git a/resource/IPCA/unittests/SConscript b/resource/IPCA/unittests/SConscript index a23f3f2..351cce6 100644 --- a/resource/IPCA/unittests/SConscript +++ b/resource/IPCA/unittests/SConscript @@ -29,9 +29,6 @@ ipcatest_env = test_env.Clone() src_dir = ipcatest_env.get('SRC_DIR') target_os = ipcatest_env.get('TARGET_OS') -if ipcatest_env['CC'] == 'cl': - ipcatest_env.AppendUnique(CCFLAGS=['/W4']) - ###################################################################### # Build flags ###################################################################### diff --git a/resource/c_common/SConscript b/resource/c_common/SConscript index 0d3fd19..1a7c4ff 100644 --- a/resource/c_common/SConscript +++ b/resource/c_common/SConscript @@ -159,13 +159,6 @@ if target_os in ['tizen', 'linux']: common_env = env.Clone() ###################################################################### -# Enable treating all warnings as errors -###################################################################### - -if target_os in ['windows', 'msys_nt']: - common_env.AppendUnique(CCFLAGS=['/W4']) - -###################################################################### # Add platform-specific helper library ###################################################################### diff --git a/resource/c_common/unittests/SConscript b/resource/c_common/unittests/SConscript index 30ace61..1ed6b9b 100644 --- a/resource/c_common/unittests/SConscript +++ b/resource/c_common/unittests/SConscript @@ -27,10 +27,6 @@ Import('test_env') common_test_env = test_env.Clone() target_os = common_test_env.get('TARGET_OS') -# Enable treating all warnings as errors for Windows. -if target_os in ['windows', 'msys_nt']: - common_test_env.AppendUnique(CCFLAGS=['/W4']) - SConscript('../oic_string/test/SConscript', exports = { 'test_env' : common_test_env}) SConscript('../oic_malloc/test/SConscript', exports = { 'test_env' : common_test_env}) SConscript('../oic_time/test/SConscript', exports = { 'test_env' : common_test_env}) diff --git a/resource/csdk/connectivity/SConscript b/resource/csdk/connectivity/SConscript index b48beb8..58a1822 100644 --- a/resource/csdk/connectivity/SConscript +++ b/resource/csdk/connectivity/SConscript @@ -17,9 +17,6 @@ print "Given OS is %s" % target_os print "BUILD_SAMPLE is %s" % build_sample print "MQ flag is %s" % with_mq -if target_os in ['msys_nt', 'windows']: - connectivity_env.AppendUnique(CCFLAGS=['/W4']) - targets_disallow_multitransport = ['arduino'] if target_os in targets_disallow_multitransport: diff --git a/resource/csdk/connectivity/test/SConscript b/resource/csdk/connectivity/test/SConscript index 38e9b35..2b38cd3 100644 --- a/resource/csdk/connectivity/test/SConscript +++ b/resource/csdk/connectivity/test/SConscript @@ -85,9 +85,6 @@ if 'SERVER' in rd_mode: if target_os not in ['msys_nt', 'windows']: catest_env.AppendUnique(LIBS = ['m']) -else: - catest_env.AppendUnique(CCFLAGS=['/W4']) - ###################################################################### # Source files and Targets ###################################################################### diff --git a/resource/csdk/resource-directory/src/rd_server.c b/resource/csdk/resource-directory/src/rd_server.c index 24c7312..0cfc11c 100644 --- a/resource/csdk/resource-directory/src/rd_server.c +++ b/resource/csdk/resource-directory/src/rd_server.c @@ -267,8 +267,10 @@ exit: * will handle REST request (GET/PUT/POST/DEL) for them. */ static OCEntityHandlerResult rdEntityHandler(OCEntityHandlerFlag flag, - OCEntityHandlerRequest *ehRequest, OC_ANNOTATE_UNUSED void *callbackParameter) + OCEntityHandlerRequest *ehRequest, void *callbackParameter) { + OC_UNUSED(callbackParameter); + OCEntityHandlerResult ehRet = OC_EH_ERROR; if (!ehRequest) diff --git a/resource/csdk/security/SConscript b/resource/csdk/security/SConscript index f422e60..377be3c 100644 --- a/resource/csdk/security/SConscript +++ b/resource/csdk/security/SConscript @@ -57,8 +57,6 @@ libocsrm_env.PrependUnique(CPPPATH = [ if target_os in ['windows', 'msys_nt']: libocsrm_env.AppendUnique(LIBPATH = [os.path.join(libocsrm_env.get('BUILD_DIR'), 'resource', 'oc_logger')]) - libocsrm_env.AppendUnique(CCFLAGS=['/W4']) - if target_os in ['linux', 'android', 'tizen', 'msys_nt', 'windows'] and libocsrm_env.get('SECURED') == '1': SConscript('provisioning/SConscript', 'libocsrm_env') diff --git a/resource/csdk/security/unittests/SConscript b/resource/csdk/security/unittests/SConscript index b830dac..f14c963 100644 --- a/resource/csdk/security/unittests/SConscript +++ b/resource/csdk/security/unittests/SConscript @@ -26,8 +26,5 @@ Import('test_env') security_test_env = test_env.Clone() -if security_test_env.get('TARGET_OS') in ['windows', 'msys_nt']: - security_test_env.AppendUnique(CCFLAGS=['/W4']) - SConscript('../unittest/SConscript', exports = { 'test_env' : security_test_env }) SConscript('../provisioning/unittest/SConscript', exports = { 'test_env' : security_test_env }) diff --git a/resource/csdk/stack/SConscript b/resource/csdk/stack/SConscript index 413c115..f548cff 100644 --- a/resource/csdk/stack/SConscript +++ b/resource/csdk/stack/SConscript @@ -120,8 +120,6 @@ if target_os in ['android', 'linux', 'tizen', 'msys_nt', 'windows']: if target_os not in ['windows', 'msys_nt']: liboctbstack_env.AppendUnique(LIBS = ['m']) else: - liboctbstack_env.AppendUnique(CCFLAGS=['/W4']) - # octbstack.def specifies the list of functions exported by octbstack.dll. liboctbstack_env.Replace(WINDOWS_INSERT_DEF = ['1']) diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp index 8b1845d..c156f32 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp @@ -968,6 +968,8 @@ int InitGetRequestWithCoap(OCDiscoveryPayload* dis, bool isUdp) // server addr OCDevAddr dev; + memset(&dev, 0, sizeof(dev)); + dev.adapter = OC_DEFAULT_ADAPTER; // find endpoint with ipv4, UDP or TCP OCResourcePayload* res = dis->resources; diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp index 47355ea..5eb1605 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp @@ -273,6 +273,8 @@ void AlarmHandler(int sig) { #ifdef SIGALRM if (sig == SIGALRM) +#else + OC_UNUSED(sig); #endif { OIC_LOG (INFO, TAG, "Server starting slow response"); diff --git a/resource/csdk/stack/test/SConscript b/resource/csdk/stack/test/SConscript index df0e10a..0904e16 100644 --- a/resource/csdk/stack/test/SConscript +++ b/resource/csdk/stack/test/SConscript @@ -67,12 +67,7 @@ if 'SERVER' in rd_mode: elif target_os in ['msys_nt', 'windows']: stacktest_env.PrependUnique(LIBS = ['sqlite3']) -if stacktest_env.get('LOGGING'): - stacktest_env.AppendUnique(CPPDEFINES = ['TB_LOG']) - -if target_os in ['msys_nt', 'windows']: - stacktest_env.AppendUnique(CCFLAGS=['/W4']) -else: +if target_os not in ['msys_nt', 'windows']: stacktest_env.PrependUnique(LIBS = ['m']) if target_os in ['tizen', 'linux']: stacktest_env.ParseConfig("pkg-config --cflags --libs gobject-2.0 gio-2.0 glib-2.0") -- 2.7.4