Remove unused function and fix wrong return value

Change-Id: I93d5566e6e69518a5417281878032d3af36b266a
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/include/DcmDbUtils.h b/include/DcmDbUtils.h
index 33b450d01894358d91d9c3699476e64a3da5d310..b0cc82eae1f79bc4d5872cf3304ca0c18633cdff 100755 (executable)
--- a/include/DcmDbUtils.h
+++ b/include/DcmDbUtils.h
@@ -47,7 +47,6 @@ public:
        int _dcm_svc_db_update_color_to_db(const DcmColorItem color);
        int _dcm_svc_db_insert_face_to_face_scan_list(DcmScanItem *scan_item);
        int _dcm_svc_db_check_scanned_by_media_uuid(const char *media_uuid, bool *media_scanned);
-       int _dcm_svc_db_send_noti(DcmFaceItem *face, DcmFaceItemUpdateItem update_item, DcmFaceItemUpdateType update_type);
 };
 
 #endif /*_DCM_DB_UTILS_H_*/

diff --git a/include/DcmTypes.h b/include/DcmTypes.h
index 04a6dc77a8f362abbb8d91c5e57cb59af52d5dff..904d07ec236af92dc796a67140e53f68e539745c 100755 (executable)
--- a/include/DcmTypes.h
+++ b/include/DcmTypes.h
@@ -38,8 +38,6 @@ typedef enum {
        DCM_ERROR_DB_NO_RESULT,
        DCM_ERROR_FILE_NOT_EXIST,
        DCM_ERROR_OUT_OF_MEMORY,
-       DCM_ERROR_VCONF_FAIL,
-       DCM_ERROR_SCAN_OPERATION,
        DCM_ERROR_IMAGE_ALREADY_SCANNED,
        DCM_ERROR_CREATE_THREAD_FAILED,
        DCM_ERROR_IMAGE_UTIL_FAILED,

diff --git a/libdcm-util/dcm_image_codec.cpp b/libdcm-util/dcm_image_codec.cpp
index 3ae677f168746705c4b5d3ff52491e3dff33e595..9a3e06ac262dba3e37ea040bc255e6496474438a 100755 (executable)
--- a/libdcm-util/dcm_image_codec.cpp
+++ b/libdcm-util/dcm_image_codec.cpp
@@ -25,6 +25,7 @@
 #include <mm_util_imgp.h>
 #include <dcm_image_debug_utils.h>
 #include <dcm_image_codec.h>
+#include <DcmTypes.h>
 
 int __dcm_decode_image_with_evas(const char *origin_path,
                                        int dest_width, int dest_height,

diff --git a/libdcm-util/include/dcm_image_debug_utils.h b/libdcm-util/include/dcm_image_debug_utils.h
index 78f4e4884179c4bf5f7ffa02bc4941b38589592c..751d84d5ccd0eb69033c4f1df788fd60cd24daa5 100755 (executable)
--- a/libdcm-util/include/dcm_image_debug_utils.h
+++ b/libdcm-util/include/dcm_image_debug_utils.h
@@ -27,17 +27,6 @@
 
 #define LOG_TAG "DCM_IMAGE_CODEC"
 
-typedef enum {
-       DCM_SUCCESS,
-       DCM_ERROR_EXIF_FAILED,
-       DCM_ERROR_INVALID_PARAMETER,
-       DCM_ERROR_OUT_OF_MEMORY,
-       DCM_ERROR_IMAGE_UTIL_FAILED,
-       DCM_ERROR_CODEC_DECODE_FAILED,
-       DCM_ERROR_INVALID_IMAGE_SIZE,
-       DCM_ERROR_UNSUPPORTED_IMAGE_TYPE,
-} DcmErrorType;
-
 #define FONT_COLOR_RESET               "\033[0m"
 #define FONT_COLOR_RED                 "\033[31m"
 #define FONT_COLOR_GREEN               "\033[32m"

diff --git a/src/DcmDbUtils.cpp b/src/DcmDbUtils.cpp
index 4489fc53adc49ccfd2508a278585bf247cc4a591..45d4a348bd4b601c8687566c05afbc2a08539792 100755 (executable)
--- a/src/DcmDbUtils.cpp
+++ b/src/DcmDbUtils.cpp
@@ -405,7 +405,8 @@ int DcmDbUtils::_dcm_svc_db_generate_uuid(DcmFaceItem **face)
 
 int DcmDbUtils::_dcm_svc_db_insert_face_to_db(DcmFaceItem *face)
 {
-       int ret = MS_MEDIA_ERR_NONE;
+       int ret = DCM_SUCCESS;
+       int err = MS_MEDIA_ERR_NONE;
        char* query_string = NULL;
 
        dcm_debug_fenter();
@@ -424,9 +425,10 @@ int DcmDbUtils::_dcm_svc_db_insert_face_to_db(DcmFaceItem *face)
        dcm_debug("query is %s", query_string);
 
        g_mutex_trylock(&gMutexLock);
-       ret = media_db_request_update_db(query_string, dcm_uid);
-       if (ret != MS_MEDIA_ERR_NONE) {
+       err = media_db_request_update_db(query_string, dcm_uid);
+       if (err != MS_MEDIA_ERR_NONE) {
                dcm_error("media_db_request_update_db fail = %d, %s", ret, sqlite3_errmsg((sqlite3 *)db_handle));
+               ret = DCM_ERROR_DB_OPERATION;
        }
        g_mutex_unlock(&gMutexLock);
 
@@ -439,7 +441,8 @@ int DcmDbUtils::_dcm_svc_db_insert_face_to_db(DcmFaceItem *face)
 
 int DcmDbUtils::_dcm_svc_db_insert_face_to_face_scan_list(DcmScanItem *scan_item)
 {
-       int ret = MS_MEDIA_ERR_NONE;
+       int ret = DCM_SUCCESS;
+       int err = MS_MEDIA_ERR_NONE;
        char* query_string = NULL;
 
        dcm_debug_fenter();
@@ -458,9 +461,10 @@ int DcmDbUtils::_dcm_svc_db_insert_face_to_face_scan_list(DcmScanItem *scan_item
        dcm_debug("query is %s", query_string);
 
        g_mutex_trylock(&gMutexLock);
-       ret = media_db_request_update_db(query_string, dcm_uid);
-       if (ret != MS_MEDIA_ERR_NONE) {
+       err = media_db_request_update_db(query_string, dcm_uid);
+       if (err != MS_MEDIA_ERR_NONE) {
                dcm_error("media_db_request_update_db is failed: %d, %s", ret, sqlite3_errmsg((sqlite3 *)db_handle));
+               ret = DCM_ERROR_DB_OPERATION;
        }
        g_mutex_unlock(&gMutexLock);
 
@@ -473,7 +477,8 @@ int DcmDbUtils::_dcm_svc_db_insert_face_to_face_scan_list(DcmScanItem *scan_item
 
 int DcmDbUtils::_dcm_svc_db_update_color_to_db(DcmColorItem color)
 {
-       int ret = MS_MEDIA_ERR_NONE;
+       int ret = DCM_SUCCESS;
+       int err = MS_MEDIA_ERR_NONE;
        char* query_string = NULL;
 
        dcm_debug_fenter();
@@ -486,9 +491,10 @@ int DcmDbUtils::_dcm_svc_db_update_color_to_db(DcmColorItem color)
        dcm_debug("query is %s", query_string);
 
        g_mutex_trylock(&gMutexLock);
-       ret = media_db_request_update_db(query_string, dcm_uid);
-       if (ret != MS_MEDIA_ERR_NONE) {
+       err = media_db_request_update_db(query_string, dcm_uid);
+       if (err != MS_MEDIA_ERR_NONE) {
                dcm_error("media_db_request_update_db fail = %d, %s", ret, sqlite3_errmsg((sqlite3 *)db_handle));
+               ret = DCM_ERROR_DB_OPERATION;
        }
        g_mutex_unlock(&gMutexLock);
 
@@ -523,6 +529,7 @@ int DcmDbUtils::_dcm_svc_db_check_scanned_by_media_uuid(const char *media_uuid,
        count = sqlite3_column_int(sql_stmt, 0);
 
        DCM_SQLITE3_FINALIZE(sql_stmt);
+       DCM_SQLITE3_FREE(query_string);
 
        if (count > 0)
                *media_scanned = TRUE;
@@ -533,25 +540,3 @@ int DcmDbUtils::_dcm_svc_db_check_scanned_by_media_uuid(const char *media_uuid,
 
        return ret;
 }
-
-int DcmDbUtils::_dcm_svc_db_send_noti(DcmFaceItem *face, DcmFaceItemUpdateItem update_item, DcmFaceItemUpdateType update_type)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-
-       dcm_debug_fenter();
-
-       if (face == NULL)
-       {
-               //ret = DCM_ERROR_INVALID_PARAMETER;
-       } else {
-               //ret = media_face_db_update_send((media_face_item_type_e)update_item, (media_face_item_update_type_e)update_type, face->media_id, face->face_uuid);
-       }
-
-       if (ret != MS_MEDIA_ERR_NONE) {
-               dcm_error("Failed to send noti after update db! err: %d, %s", ret, sqlite3_errmsg((sqlite3 *)db_handle));
-       }
-
-       dcm_debug_fleave();
-
-       return ret;
-}

diff --git a/src/DcmFaceUtils.cpp b/src/DcmFaceUtils.cpp
index a7d67d3bf7a1766fe55f84630d80fa956ef32e71..853591b58bce3f8d894e77236298d8b98327d4c3 100755 (executable)
--- a/src/DcmFaceUtils.cpp
+++ b/src/DcmFaceUtils.cpp
@@ -175,7 +175,6 @@ int DcmFaceUtils::runFaceRecognizeProcess(DcmScanItem *scan_item, DcmImageInfo *
                }
 
                /* Send db updated notification */
-               dcmDbUtils->_dcm_svc_db_send_noti(face, DCM_FACE_ITEM_UPDATE_FACE, DCM_FACE_ITEM_INSERT);
                if (face != NULL) {
                        DcmFaceApi::freeDcmFaceItem(face);
                        face = NULL;
@@ -184,7 +183,10 @@ int DcmFaceUtils::runFaceRecognizeProcess(DcmScanItem *scan_item, DcmImageInfo *
 
 DCM_SVC_FACE_RECOGNIZE_BUFFER_FAILED:
 
-       dcmDbUtils->_dcm_svc_db_insert_face_to_face_scan_list(scan_item);
+       err = dcmDbUtils->_dcm_svc_db_insert_face_to_face_scan_list(scan_item);
+       if (err != DCM_SUCCESS) {
+               dcm_error("Failed to insert face item into face_scan_list! err: %d", err);
+       }
 
        if (face_info != NULL) {
                dcm_face_destroy_face_info(face_info);

diff --git a/src/DcmScanSvc.cpp b/src/DcmScanSvc.cpp
index 60ce8429fedc0112a210dcb82f03fdb5f0f12153..787e4a27b5fb4595490fb0c9616570be77497c25 100755 (executable)
--- a/src/DcmScanSvc.cpp
+++ b/src/DcmScanSvc.cpp
@@ -474,7 +474,7 @@ int DcmScanSvc::receiveMsg(DcmIpcMsg *recv_msg)
        ret = dcmDbUtils->_dcm_svc_db_connect(recv_msg->uid);
        if (ret != MS_MEDIA_ERR_NONE) {
                dcm_error("Failed to connect DB! err: %d", ret);
-               return ret;
+               return DCM_ERROR_DB_OPERATION;
        }
 
        if (recv_msg->msg_type == DCM_IPC_MSG_SCAN_ALL)
@@ -513,7 +513,7 @@ int DcmScanSvc::receiveMsg(DcmIpcMsg *recv_msg)
        ret = dcmDbUtils->_dcm_svc_db_disconnect();
        if (ret != DCM_SUCCESS) {
                dcm_error("Failed to disconnect DB! err: %d", ret);
-               return FALSE;
+               return DCM_ERROR_DB_OPERATION;
        }
 
        return ret;