From 7282bb9f35ec66ff697cbc97165c6eb25b0bf7a2 Mon Sep 17 00:00:00 2001 From: Jiyong Min Date: Tue, 27 Jun 2017 19:32:16 +0900 Subject: [PATCH] Change color of log and remove unused define macro Change-Id: Ie3d7d232ce4d7591748950e5e90e81f6fd53e4d5 Signed-off-by: Jiyong Min --- include/dcm_svc_debug.h | 38 +++++++------- libdcm-face/dcm-face-debug.h | 39 +++++++------- libdcm-util/include/dcm_image_codec_debug.h | 56 ++++++++++----------- 3 files changed, 62 insertions(+), 71 deletions(-) diff --git a/include/dcm_svc_debug.h b/include/dcm_svc_debug.h index 29d7f3c..a6118d0 100755 --- a/include/dcm_svc_debug.h +++ b/include/dcm_svc_debug.h @@ -30,43 +30,40 @@ #define FONT_COLOR_RESET "\033[0m" #define FONT_COLOR_RED "\033[31m" #define FONT_COLOR_GREEN "\033[32m" -#define FONT_COLOR_YELLOW "\033[33m" -#define FONT_COLOR_BLUE "\033[34m" -#define FONT_COLOR_PURPLE "\033[35m" #define FONT_COLOR_CYAN "\033[36m" -#define FONT_COLOR_GRAY "\033[37m" #define dcm_debug(fmt, arg...) do { \ - LOGD(FONT_COLOR_CYAN"" fmt "" FONT_COLOR_RESET, ##arg); \ - } while (0) + LOGD(FONT_COLOR_RESET"" fmt "", ##arg); \ + } while (0) #define dcm_info(fmt, arg...) do { \ - LOGI(FONT_COLOR_YELLOW"" fmt "" FONT_COLOR_RESET, ##arg); \ - } while (0) + LOGI(FONT_COLOR_GREEN"" fmt "" FONT_COLOR_RESET, ##arg); \ + } while (0) #define dcm_warn(fmt, arg...) do { \ - LOGW(FONT_COLOR_GREEN"" fmt "" FONT_COLOR_RESET, ##arg); \ - } while (0) + 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); \ - } while (0) + 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); \ - } while (0) + 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); \ - } while (0) + SECURE_LOGI(FONT_COLOR_CYAN"" fmt "" FONT_COLOR_RESET, ##arg); \ + } while (0) #define dcm_sec_warn(fmt, arg...) do { \ - SECURE_LOGW(FONT_COLOR_GREEN"" fmt "" FONT_COLOR_RESET, ##arg); \ - } while (0) + SECURE_LOGW(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ + } while (0) #define dcm_sec_error(fmt, arg...) do { \ - SECURE_LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ - } while (0) + SECURE_LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ + } while (0) + #define dcm_debug_fenter() do { \ LOGD(FONT_COLOR_RESET""); \ } while (0) @@ -74,6 +71,7 @@ #define dcm_debug_fleave() do { \ LOGD(FONT_COLOR_RESET""); \ } while (0) + #define dcm_retm_if(expr, fmt, arg...) do { \ if (expr) { \ LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ diff --git a/libdcm-face/dcm-face-debug.h b/libdcm-face/dcm-face-debug.h index 7a21467..7325dd4 100755 --- a/libdcm-face/dcm-face-debug.h +++ b/libdcm-face/dcm-face-debug.h @@ -28,43 +28,40 @@ #define FONT_COLOR_RESET "\033[0m" #define FONT_COLOR_RED "\033[31m" #define FONT_COLOR_GREEN "\033[32m" -#define FONT_COLOR_YELLOW "\033[33m" -#define FONT_COLOR_BLUE "\033[34m" -#define FONT_COLOR_PURPLE "\033[35m" #define FONT_COLOR_CYAN "\033[36m" -#define FONT_COLOR_GRAY "\033[37m" #define dcm_debug(fmt, arg...) do { \ - LOGD(FONT_COLOR_CYAN""fmt""FONT_COLOR_RESET, ##arg); \ - } while (0) + LOGD(FONT_COLOR_RESET""fmt"", ##arg); \ + } while (0) #define dcm_info(fmt, arg...) do { \ - LOGI(FONT_COLOR_YELLOW""fmt""FONT_COLOR_RESET, ##arg); \ - } while (0) + LOGI(FONT_COLOR_GREEN""fmt""FONT_COLOR_RESET, ##arg); \ + } while (0) #define dcm_warn(fmt, arg...) do { \ - LOGW(FONT_COLOR_GREEN""fmt""FONT_COLOR_RESET, ##arg); \ - } while (0) + 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); \ - } while (0) + 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); \ - } while (0) + 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); \ - } while (0) + SECURE_LOGI(FONT_COLOR_CYAN""fmt""FONT_COLOR_RESET, ##arg); \ + } while (0) #define dcm_sec_warn(fmt, arg...) do { \ - SECURE_LOGW(FONT_COLOR_GREEN""fmt""FONT_COLOR_RESET, ##arg); \ - } while (0) + SECURE_LOGW(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ + } while (0) #define dcm_sec_error(fmt, arg...) do { \ - SECURE_LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ - } while (0) + SECURE_LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ + } while (0) + #define dcm_debug_fenter() do { \ LOGD(FONT_COLOR_RESET""); \ } while (0) @@ -72,6 +69,7 @@ #define dcm_debug_fleave() do { \ LOGD(FONT_COLOR_RESET""); \ } while (0) + #define dcm_retm_if(expr, fmt, arg...) do { \ if (expr) { \ LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ @@ -86,5 +84,4 @@ } \ } while (0) - #endif /*__FACE_DEBUG_H__ */ diff --git a/libdcm-util/include/dcm_image_codec_debug.h b/libdcm-util/include/dcm_image_codec_debug.h index 4b295ed..0c3eced 100755 --- a/libdcm-util/include/dcm_image_codec_debug.h +++ b/libdcm-util/include/dcm_image_codec_debug.h @@ -30,59 +30,55 @@ #define FONT_COLOR_RESET "\033[0m" #define FONT_COLOR_RED "\033[31m" #define FONT_COLOR_GREEN "\033[32m" -#define FONT_COLOR_YELLOW "\033[33m" -#define FONT_COLOR_BLUE "\033[34m" -#define FONT_COLOR_PURPLE "\033[35m" #define FONT_COLOR_CYAN "\033[36m" -#define FONT_COLOR_GRAY "\033[37m" #define dcm_debug(fmt, arg...) do { \ - LOGD(FONT_COLOR_CYAN"" fmt "" FONT_COLOR_RESET, ##arg); \ - } while (0) + LOGD(FONT_COLOR_RESET"" fmt "", ##arg); \ + } while (0) #define dcm_info(fmt, arg...) do { \ - LOGI(FONT_COLOR_YELLOW"" fmt "" FONT_COLOR_RESET, ##arg); \ - } while (0) + LOGI(FONT_COLOR_GREEN"" fmt "" FONT_COLOR_RESET, ##arg); \ + } while (0) #define dcm_warn(fmt, arg...) do { \ - LOGW(FONT_COLOR_GREEN"" fmt "" FONT_COLOR_RESET, ##arg); \ - } while (0) + 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); \ - } while (0) + 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); \ - } while (0) + SECURE_LOGD(FONT_COLOR_CYAN"" fmt "", ##arg); \ + } while (0) #define dcm_sec_info(fmt, arg...) do { \ - SECURE_LOGI(FONT_COLOR_YELLOW"" fmt "" FONT_COLOR_RESET, ##arg); \ - } while (0) + SECURE_LOGI(FONT_COLOR_CYAN"" fmt "" FONT_COLOR_RESET, ##arg); \ + } while (0) #define dcm_sec_warn(fmt, arg...) do { \ - SECURE_LOGW(FONT_COLOR_GREEN"" fmt "" FONT_COLOR_RESET, ##arg); \ - } while (0) + SECURE_LOGW(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ + } while (0) #define dcm_sec_error(fmt, arg...) do { \ - SECURE_LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET , ##arg); \ - } while (0) + SECURE_LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET , ##arg); \ + } while (0) #define dcm_debug_fenter() do { \ - LOGD(FONT_COLOR_RESET""); \ - } while (0) + LOGD(FONT_COLOR_RESET""); \ + } while (0) #define dcm_debug_fleave() do { \ - LOGD(FONT_COLOR_RESET""); \ - } while (0) + LOGD(FONT_COLOR_RESET""); \ + } while (0) #define dcm_retvm_if(expr, val, fmt, arg...) do { \ - if (expr) { \ - dcm_error(fmt, ##arg); \ - dcm_error("(%s) -> %s() return", #expr, __FUNCTION__); \ - return (val); \ - } \ - } while (0) + if (expr) { \ + dcm_error(fmt, ##arg); \ + dcm_error("(%s) -> %s() return", #expr, __FUNCTION__); \ + return (val); \ + } \ + } while (0) #define DCM_CHECK_VAL(expr, val) dcm_retvm_if(!(expr), val , "Invalid parameter, return ERROR code!") -- 2.34.1