Add -Werror and fix warnings (VD Reqirement)

Change-Id: I4a6651f58d7940244f0799e572b50ecb6b32aa64

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dc49d6065733ba2188b72fa6cf44fc3c9ca1deb..580d78190004cc953ab1d5fa2b20810ae4ae3735 100755 (executable)
--- 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 9b17b9087a136b6c5426820dcbc9cfb341fdb949..4fce682fea062eadfd717f15420e7d31719653c5 100755 (executable)
--- 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"<Enter>"); \
@@ -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 05e3fe1a003c8c9ac007265345cfc2ce967fe3d8..6926c40620847880df4dc5c5d968e42170da82b2 100755 (executable)
--- 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 55b95cbb38b9ca628512ea57eecaaf489e63f096..96bc169ce3cdec5bbb91e8493136ee42fc1ab087 100755 (executable)
--- 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 3c8edd33b32a66d1964cdcc51519af29f2adbd0a..9c206d75c0e47cb72e295968a273656d3d769368 100755 (executable)
--- 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;