From 4f9737101fba4de081be1180b7103657a597960e Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Wed, 16 Mar 2016 10:24:07 +0900 Subject: [PATCH] Fix build warning Change-Id: I6055a44bb7cf4174461ef1eb32d68491df557917 Signed-off-by: Minje Ahn --- include/DcmDbUtils.h | 2 +- include/DcmDebugUtils.h | 3 +-- include/DcmMainSvc.h | 2 +- libdcm-util/include/dcm_image_debug_utils.h | 3 +-- src/DcmIpcUtils.cpp | 1 - 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/DcmDbUtils.h b/include/DcmDbUtils.h index b0cc82e..f03db10 100755 --- a/include/DcmDbUtils.h +++ b/include/DcmDbUtils.h @@ -36,7 +36,7 @@ private: public: uid_t dcm_uid; - static DcmDbUtils *getInstance(); + static DcmDbUtils *getInstance(void); int _dcm_svc_db_connect(uid_t uid); int _dcm_svc_db_disconnect(); int _dcm_svc_db_get_scan_image_list_by_path(GList **image_list, bool mmc_mounted, const char *file_path); diff --git a/include/DcmDebugUtils.h b/include/DcmDebugUtils.h index 9e7d29c..3fe9028 100755 --- a/include/DcmDebugUtils.h +++ b/include/DcmDebugUtils.h @@ -90,8 +90,7 @@ #define ERR_BUF_LENGHT 256 #define dcm_stderror(fmt) do { \ char dcm_stderror_buf[ERR_BUF_LENGHT] = {0, }; \ - strerror_r(errno, dcm_stderror_buf, ERR_BUF_LENGHT); \ - dcm_error(fmt" : standard error= [%s]", dcm_stderror_buf); \ + LOGE(fmt" : standard error= [%s]", strerror_r(errno, dcm_stderror_buf, ERR_BUF_LENGHT)); \ } while (0) #define DCM_CHECK_VAL(expr, val) dcm_retvm_if(!(expr), val, "Invalid parameter, return ERROR code!") diff --git a/include/DcmMainSvc.h b/include/DcmMainSvc.h index b7ac079..b371a76 100755 --- a/include/DcmMainSvc.h +++ b/include/DcmMainSvc.h @@ -45,7 +45,7 @@ public: GSource *main_thread_quit_timer; bool scan_thread_working; - static DcmMainSvc *getInstance(); + static DcmMainSvc *getInstance(void); void dcmServiceStartjobs(); void dcmServiceFinishjobs(); int waitScanThreadReady(); diff --git a/libdcm-util/include/dcm_image_debug_utils.h b/libdcm-util/include/dcm_image_debug_utils.h index 751d84d..52db91b 100755 --- a/libdcm-util/include/dcm_image_debug_utils.h +++ b/libdcm-util/include/dcm_image_debug_utils.h @@ -95,8 +95,7 @@ #define ERR_BUF_LENGHT 256 #define dcm_stderror(fmt) do { \ char dcm_stderror_buf[ERR_BUF_LENGHT] = {0, }; \ - strerror_r(errno, dcm_stderror_buf, ERR_BUF_LENGHT); \ - dcm_error(fmt" : standard error= [%s]", dcm_stderror_buf); \ + LOGE(fmt" : standard error= [%s]", strerror_r(errno, dcm_stderror_buf, ERR_BUF_LENGHT)); \ } while (0) #define DCM_CHECK_VAL(expr, val) dcm_retvm_if(!(expr), val , "Invalid parameter, return ERROR code!") diff --git a/src/DcmIpcUtils.cpp b/src/DcmIpcUtils.cpp index 0eb3bd4..80b1939 100755 --- a/src/DcmIpcUtils.cpp +++ b/src/DcmIpcUtils.cpp @@ -143,7 +143,6 @@ int DcmIpcUtils::sendClientSocketMsg(int socket_fd, DcmIpcMsgType msg_type, uid_ dcm_debug("Send message type: %d", msg_type); DcmIpcMsg send_msg; - int err = 0; int sock = -1; if (socket_fd < 0) { -- 2.34.1