From d06dfbc8e912191d970eb90b0b25fa6133666434 Mon Sep 17 00:00:00 2001 From: Haejeong Kim Date: Mon, 22 May 2017 16:54:15 +0900 Subject: [PATCH] Add -Werror and fix warnings (VD Reqirement) Change-Id: I4a6651f58d7940244f0799e572b50ecb6b32aa64 --- CMakeLists.txt | 2 +- include/DcmDebugUtils.h | 20 ++++++++++---------- libdcm-util/include/dcm_image_debug_utils.h | 16 ++++++++-------- packaging/dcm-service.spec | 2 +- src/DcmDbUtils.cpp | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dc49d6..580d781 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ ENDFOREACH(flag) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIC") -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -fpermissive -fdump-rtl-expand -fPIC -Wall") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -fpermissive -fdump-rtl-expand -fPIC -Wall -Werror") SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -fPIC") diff --git a/include/DcmDebugUtils.h b/include/DcmDebugUtils.h index 9b17b90..4fce682 100755 --- a/include/DcmDebugUtils.h +++ b/include/DcmDebugUtils.h @@ -36,35 +36,35 @@ #define FONT_COLOR_GRAY "\033[37m" #define dcm_debug(fmt, arg...) do { \ - LOGD(FONT_COLOR_CYAN"" fmt ""FONT_COLOR_RESET, ##arg); \ + LOGD(FONT_COLOR_CYAN"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_info(fmt, arg...) do { \ - LOGI(FONT_COLOR_YELLOW"" fmt ""FONT_COLOR_RESET, ##arg); \ + LOGI(FONT_COLOR_YELLOW"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_warn(fmt, arg...) do { \ - LOGW(FONT_COLOR_GREEN"" fmt ""FONT_COLOR_RESET, ##arg); \ + LOGW(FONT_COLOR_GREEN"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_error(fmt, arg...) do { \ - LOGE(FONT_COLOR_RED"" fmt ""FONT_COLOR_RESET, ##arg); \ + LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_sec_debug(fmt, arg...) do { \ - SECURE_LOGD(FONT_COLOR_CYAN"" fmt ""FONT_COLOR_RESET, ##arg); \ + SECURE_LOGD(FONT_COLOR_CYAN"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_sec_info(fmt, arg...) do { \ - SECURE_LOGI(FONT_COLOR_YELLOW"" fmt ""FONT_COLOR_RESET, ##arg); \ + SECURE_LOGI(FONT_COLOR_YELLOW"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_sec_warn(fmt, arg...) do { \ - SECURE_LOGW(FONT_COLOR_GREEN"" fmt ""FONT_COLOR_RESET, ##arg); \ + SECURE_LOGW(FONT_COLOR_GREEN"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_sec_error(fmt, arg...) do { \ - SECURE_LOGE(FONT_COLOR_RED"" fmt ""FONT_COLOR_RESET, ##arg); \ + SECURE_LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_debug_fenter() do { \ LOGD(FONT_COLOR_RESET""); \ @@ -75,14 +75,14 @@ } while (0) #define dcm_retm_if(expr, fmt, arg...) do { \ if (expr) { \ - LOGE(FONT_COLOR_RED"" fmt ""FONT_COLOR_RESET, ##arg); \ + LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ return; \ } \ } while (0) #define dcm_retvm_if(expr, val, fmt, arg...) do { \ if (expr) { \ - LOGE(FONT_COLOR_RED"" fmt ""FONT_COLOR_RESET, ##arg); \ + LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ return (val); \ } \ } while (0) diff --git a/libdcm-util/include/dcm_image_debug_utils.h b/libdcm-util/include/dcm_image_debug_utils.h index 05e3fe1..6926c40 100755 --- a/libdcm-util/include/dcm_image_debug_utils.h +++ b/libdcm-util/include/dcm_image_debug_utils.h @@ -37,35 +37,35 @@ #define FONT_COLOR_GRAY "\033[37m" #define dcm_debug(fmt, arg...) do { \ - LOGD(FONT_COLOR_CYAN"" fmt ""FONT_COLOR_RESET, ##arg); \ + LOGD(FONT_COLOR_CYAN"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_info(fmt, arg...) do { \ - LOGI(FONT_COLOR_YELLOW"" fmt ""FONT_COLOR_RESET, ##arg); \ + LOGI(FONT_COLOR_YELLOW"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_warn(fmt, arg...) do { \ - LOGW(FONT_COLOR_GREEN"" fmt ""FONT_COLOR_RESET, ##arg); \ + LOGW(FONT_COLOR_GREEN"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_error(fmt, arg...) do { \ - LOGE(FONT_COLOR_RED"" fmt ""FONT_COLOR_RESET, ##arg); \ + LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_sec_debug(fmt, arg...) do { \ - SECURE_LOGD(FONT_COLOR_CYAN"" fmt ""FONT_COLOR_RESET, ##arg); \ + SECURE_LOGD(FONT_COLOR_CYAN"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_sec_info(fmt, arg...) do { \ - SECURE_LOGI(FONT_COLOR_YELLOW"" fmt ""FONT_COLOR_RESET, ##arg); \ + SECURE_LOGI(FONT_COLOR_YELLOW"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_sec_warn(fmt, arg...) do { \ - SECURE_LOGW(FONT_COLOR_GREEN"" fmt ""FONT_COLOR_RESET, ##arg); \ + SECURE_LOGW(FONT_COLOR_GREEN"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) #define dcm_sec_error(fmt, arg...) do { \ - SECURE_LOGE(FONT_COLOR_RED"" fmt ""FONT_COLOR_RESET , ##arg); \ + SECURE_LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET , ##arg); \ } while (0) #define dcm_debug_fenter() do { \ diff --git a/packaging/dcm-service.spec b/packaging/dcm-service.spec index 55b95cb..96bc169 100755 --- a/packaging/dcm-service.spec +++ b/packaging/dcm-service.spec @@ -1,6 +1,6 @@ Name: dcm-service Summary: A media DCM(Digital Contents Management) Service -Version: 0.0.15 +Version: 0.0.16 Release: 0 Group: Multimedia/Service License: Apache-2.0 diff --git a/src/DcmDbUtils.cpp b/src/DcmDbUtils.cpp index 3c8edd3..9c206d7 100755 --- a/src/DcmDbUtils.cpp +++ b/src/DcmDbUtils.cpp @@ -40,8 +40,8 @@ #define SELECT_PATH_FROM_UNEXTRACTED_DCM_INTERNAL_MEDIA "SELECT media_uuid, path, storage_uuid, width, height, orientation, mime_type FROM media WHERE media_uuid NOT IN (SELECT DISTINCT media_uuid FROM face_scan_list) AND validity=1 AND media_type=0 AND storage_type=0;" #define SELECT_MEDIA_INFO_BY_FILE_PATH_FROM_DB "SELECT media_uuid, storage_uuid, width, height, orientation, mime_type FROM media WHERE path = '%q';" -#define INSERT_FACE_ITEM_TO_DB "INSERT INTO "DB_TABLE_FACE" ("FACE_ITEM") VALUES ('%q', '%q', %d, %d, %d, %d, %d);" -#define UPDATE_COLOR_ITEM_TO_DB "UPDATE "DB_TABLE_MEDIA" SET color_r=%d, color_g=%d, color_b=%d WHERE media_uuid='%q' AND storage_uuid='%q';" +#define INSERT_FACE_ITEM_TO_DB "INSERT INTO " DB_TABLE_FACE" (" FACE_ITEM") VALUES ('%q', '%q', %d, %d, %d, %d, %d);" +#define UPDATE_COLOR_ITEM_TO_DB "UPDATE " DB_TABLE_MEDIA" SET color_r=%d, color_g=%d, color_b=%d WHERE media_uuid='%q' AND storage_uuid='%q';" static GMutex gMutexLock; -- 2.34.1