Just update debug msg and return value.

Change-Id: I35101f0ffc279cb0acd6aeb59bf271585710e840

diff --git a/src/dcm_svc_db.c b/src/dcm_svc_db.c
index f1a22a99b7efaedbaef07d3b58161f8afa36c408..4b1b3732185a9460a9d148c5adebbda33d6a589c 100755 (executable)
--- a/src/dcm_svc_db.c
+++ b/src/dcm_svc_db.c
@@ -33,7 +33,7 @@ static gboolean __dcm_svc_db_check_duplicated_scan_list(MediaDBHandle *db_handle
 static int __dcm_svc_sql_prepare_to_step(sqlite3 *handle, const char *sql_str, sqlite3_stmt** stmt);
 static int __dcm_svc_sql_prepare_to_step_simple(sqlite3 *handle, const char *sql_str, sqlite3_stmt** stmt);
 
-gboolean __dcm_svc_db_check_duplicated(MediaDBHandle *db_handle, dcm_face_item_s *data)
+static gboolean __dcm_svc_db_check_duplicated(MediaDBHandle *db_handle, dcm_face_item_s *data)
 {
        int ret = MS_MEDIA_ERR_NONE;
        sqlite3 * handle = (sqlite3 *)db_handle;
@@ -68,7 +68,7 @@ gboolean __dcm_svc_db_check_duplicated(MediaDBHandle *db_handle, dcm_face_item_s
        return FALSE;
 }
 
-gboolean __dcm_svc_db_check_duplicated_scan_list(MediaDBHandle *db_handle, const char *data)
+static gboolean __dcm_svc_db_check_duplicated_scan_list(MediaDBHandle *db_handle, const char *data)
 {
        int ret = MS_MEDIA_ERR_NONE;
        sqlite3 * handle = (sqlite3 *)db_handle;
@@ -138,7 +138,7 @@ static int __dcm_svc_sql_prepare_to_step_simple(sqlite3 *handle, const char *sql
 {
        int ret = MS_MEDIA_ERR_NONE;
 
-       dcm_debug("[SQL query] : %s", sql_str);
+       dcm_sec_debug("[SQL query] : %s", sql_str);
 
        if (!DCM_STRING_VALID(sql_str)) {
                dcm_error("invalid query");
@@ -212,12 +212,12 @@ int dcm_svc_db_get_scan_image_info_by_path(const char *file_path, dcm_svc_item_s
 
        dcm_debug_fenter();
 
-       DCM_CHECK_VAL(db_handle, MS_MEDIA_ERR_INVALID_PARAMETER);
-       DCM_CHECK_VAL(file_path, MS_MEDIA_ERR_INVALID_PARAMETER);
+       dcm_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle");
+       dcm_retvm_if(!DCM_STRING_VALID(file_path), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid file_path");
 
        /* Make query */
        query_string = sqlite3_mprintf(SELECT_MEDIA_INFO_BY_FILE_PATH_FROM_DB, file_path);
-       DCM_CHECK_VAL(query_string, MS_MEDIA_ERR_OUT_OF_MEMORY);
+       dcm_retvm_if(query_string == NULL, MS_MEDIA_ERR_OUT_OF_MEMORY, "Invalid query_string");
 
        ret = __dcm_svc_sql_prepare_to_step((sqlite3 *)db_handle, query_string, &sql_stmt);
        dcm_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "Fail __dcm_svc_sql_prepare_to_step [%d]", ret);
@@ -257,12 +257,12 @@ int dcm_svc_db_get_scan_image_list_from_db(GList **image_list)
 
        dcm_debug_fenter();
 
-       DCM_CHECK_VAL(db_handle, MS_MEDIA_ERR_INVALID_PARAMETER);
-       DCM_CHECK_VAL(image_list, MS_MEDIA_ERR_INVALID_PARAMETER);
+       dcm_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle");
+       dcm_retvm_if(image_list == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid image_list");
 
        /* Make query */
        query_string = sqlite3_mprintf(SELECT_PATH_FROM_UNEXTRACTED_DCM_MEDIA);
-       DCM_CHECK_VAL(query_string, MS_MEDIA_ERR_OUT_OF_MEMORY);
+       dcm_retvm_if(query_string == NULL, MS_MEDIA_ERR_OUT_OF_MEMORY, "Invalid query_string");
 
        ret = __dcm_svc_sql_prepare_to_step_simple((sqlite3 *)db_handle, query_string, &sql_stmt);
        if (ret != MS_MEDIA_ERR_NONE) {
@@ -304,7 +304,7 @@ int dcm_svc_db_generate_uuid(dcm_face_item_s **face)
        static char uuid_unparsed[50] = {0, };
 
        dcm_debug_fenter();
-       DCM_CHECK_VAL(face, MS_MEDIA_ERR_INVALID_PARAMETER);
+       dcm_retvm_if(face == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid face");
 
        uuid_generate(uuid_value);
        uuid_unparse(uuid_value, uuid_unparsed);
@@ -328,9 +328,9 @@ int dcm_svc_db_insert_face_to_db(dcm_face_item_s *face)
 
        dcm_debug_fenter();
 
-       DCM_CHECK_VAL(db_handle, MS_MEDIA_ERR_INVALID_PARAMETER);
-       DCM_CHECK_VAL(face, MS_MEDIA_ERR_INVALID_PARAMETER);
-       DCM_CHECK_VAL(face->face_uuid, MS_MEDIA_ERR_INVALID_PARAMETER);
+       dcm_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle");
+       dcm_retvm_if(face == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid face");
+       dcm_retvm_if(face->face_uuid == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid face_uuid");
 
        if (__dcm_svc_db_check_duplicated(db_handle, face) == TRUE) {
                dcm_error("[__dcm_svc_db_check_duplicated] The data is duplicated!");
@@ -362,9 +362,9 @@ int dcm_svc_db_insert_face_to_face_scan_list(dcm_svc_item_s *scan_item)
 
        dcm_debug_fenter();
 
-       DCM_CHECK_VAL(db_handle, MS_MEDIA_ERR_INVALID_PARAMETER);
-       DCM_CHECK_VAL(scan_item, MS_MEDIA_ERR_INVALID_PARAMETER);
-       DCM_CHECK_VAL(scan_item->media_uuid, MS_MEDIA_ERR_INVALID_PARAMETER);
+       dcm_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle");
+       dcm_retvm_if(scan_item == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid scan_item");
+       dcm_retvm_if(scan_item->media_uuid == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid");
 
        if (__dcm_svc_db_check_duplicated_scan_list(db_handle, scan_item->media_uuid) == TRUE) {
                dcm_error("[_dcm_svc_db_insert_face_to_face_scan_list] The data is duplicated!");
@@ -396,9 +396,9 @@ int dcm_svc_db_update_face_to_face_scan_list(dcm_svc_item_s *scan_item)
 
        dcm_debug_fenter();
 
-       DCM_CHECK_VAL(db_handle, MS_MEDIA_ERR_INVALID_PARAMETER);
-       DCM_CHECK_VAL(scan_item, MS_MEDIA_ERR_INVALID_PARAMETER);
-       DCM_CHECK_VAL(scan_item->media_uuid, MS_MEDIA_ERR_INVALID_PARAMETER);
+       dcm_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle");
+       dcm_retvm_if(scan_item == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid scan_item");
+       dcm_retvm_if(scan_item->media_uuid == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid");
 
        query_string = sqlite3_mprintf("UPDATE %s SET modified_time = %d WHERE media_uuid='%q'", DB_TABLE_FACE_SCAN_LIST, scan_item->modified_time, scan_item->media_uuid);
 
@@ -425,8 +425,8 @@ int dcm_svc_db_delete_face_from_db(const char *media_uuid)
 
        dcm_debug_fenter();
 
-       DCM_CHECK_VAL(db_handle, MS_MEDIA_ERR_INVALID_PARAMETER);
-       DCM_CHECK_VAL(media_uuid, MS_MEDIA_ERR_INVALID_PARAMETER);
+       dcm_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle");
+       dcm_retvm_if(media_uuid == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid");
 
        query_string = sqlite3_mprintf("DELETE FROM %s WHERE media_uuid='%q' AND user_marked = 0", DB_TABLE_FACE, media_uuid);
 
@@ -454,9 +454,9 @@ int dcm_svc_db_update_color_to_db(dcm_color_item_s color)
 #if 0
        char* query_string = NULL;
 
-       DCM_CHECK_VAL(db_handle, MS_MEDIA_ERR_INVALID_PARAMETER);
-       DCM_CHECK_VAL(color.media_uuid, MS_MEDIA_ERR_INVALID_PARAMETER);
-       DCM_CHECK_VAL(color.storage_uuid, MS_MEDIA_ERR_INVALID_PARAMETER);
+       dcm_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle");
+       dcm_retvm_if(color.media_uuid == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid");
+       dcm_retvm_if(color.storage_uuid == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_uuid");
 
        query_string = sqlite3_mprintf(UPDATE_COLOR_ITEM_TO_DB, (int)(color.rgb_r), (int)(color.rgb_g), (int)(color.rgb_b), color.media_uuid, color.storage_uuid);
        dcm_debug("query is %s", query_string);
@@ -483,11 +483,11 @@ int dcm_svc_db_check_scanned_by_media_uuid(const char *media_uuid, time_t modifi
 
        dcm_debug_fenter();
 
-       DCM_CHECK_VAL(db_handle, MS_MEDIA_ERR_INVALID_PARAMETER);
-       DCM_CHECK_VAL(media_uuid, MS_MEDIA_ERR_INVALID_PARAMETER);
+       dcm_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle");
+       dcm_retvm_if(media_uuid == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid");
 
        query_string = sqlite3_mprintf(SELECT_SCAN_INFO_BY_MEDIA_ID, media_uuid);
-       DCM_CHECK_VAL(query_string, MS_MEDIA_ERR_OUT_OF_MEMORY);
+       dcm_retvm_if(query_string == NULL, MS_MEDIA_ERR_OUT_OF_MEMORY, "Invalid query_string");
 
        ret = __dcm_svc_sql_prepare_to_step((sqlite3 *)db_handle, query_string, &sql_stmt);
        if (ret == MS_MEDIA_ERR_DB_NO_RECORD) {

diff --git a/src/dcm_svc_internal.c b/src/dcm_svc_internal.c
index b399347c58325da947f2970e8e27427924166896..54860ba19f72cb2886c61c87551ca6dd8b5477d1 100755 (executable)
--- a/src/dcm_svc_internal.c
+++ b/src/dcm_svc_internal.c
@@ -553,9 +553,7 @@ int dcm_scan_single(const char *file_path, uid_t uid, int *face_count)
                        dcm_svc_db_insert_face_to_face_scan_list(scan_item);
        }
 
-       ret = dcm_svc_db_disconnect();
-       if (ret != MS_MEDIA_ERR_NONE)
-               dcm_error("Failed to disconnect db! err: %d", ret);
+       dcm_svc_db_disconnect();
 
        *face_count = scan_item->face_count;
        dcm_debug("*face_count is %d", *face_count);
@@ -564,7 +562,7 @@ int dcm_scan_single(const char *file_path, uid_t uid, int *face_count)
 
        dcm_debug_fleave();
 
-       return MS_MEDIA_ERR_NONE;
+       return ret;
 }
 
 gboolean dcm_scan_thread(void *data)