Change GArray to GPtrArray

Change-Id: If7bef21b0aebdabb60dfb14634fced0ee647cecd
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index 1c0ee4d..5941e68 100755 (executable)
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -49,17 +49,10 @@ GArray *req_list;
 static int _check_dir_path(const char *dir_path, uid_t uid)
 {
        ms_user_storage_type_e storage_type;
-       int ret = MS_MEDIA_ERR_NONE;
-
-       ret = ms_user_get_storage_type(uid, dir_path, &storage_type);
-       MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, MS_MEDIA_ERR_INVALID_PATH, "Invalid path");
 
-       if (g_file_test(dir_path, G_FILE_TEST_EXISTS)) {
-               if (!g_file_test(dir_path, G_FILE_TEST_IS_DIR))
-                       MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, MS_MEDIA_ERR_INVALID_PATH, "Invalid path : %s is not directory", dir_path);
-       }
+       MSAPI_RETV_IF(!g_file_test(dir_path, G_FILE_TEST_IS_DIR), MS_MEDIA_ERR_INVALID_PATH);
 
-       return MS_MEDIA_ERR_NONE;
+       return ms_user_get_storage_type(uid, dir_path, &storage_type);
 }
 
 /* receive message from media-server[function : ms_receive_message_from_scanner] */
@@ -451,7 +444,7 @@ int media_directory_scanning_async(const char *directory_path, const char *stora
        int ret = MS_MEDIA_ERR_NONE;
 
        ret = _check_dir_path(directory_path, uid);
-       MSAPI_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret);
+       MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "Invalid path");
 
        if (recursive_on)
                ret = __media_db_request_update_async(MS_MSG_DIRECTORY_SCANNING, storage_id, directory_path, user_callback, user_data, uid);
@@ -466,7 +459,7 @@ int media_directory_scanning_cancel(const char *directory_path, uid_t uid)
        int ret = MS_MEDIA_ERR_NONE;
 
        ret = _check_dir_path(directory_path, uid);
-       MSAPI_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret);
+       MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "Invalid path");
 
        ret = __media_db_request_update_cancel(MS_MSG_DIRECTORY_SCANNING_CANCEL, directory_path);
 

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index b706889..6c765dc 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -373,11 +373,13 @@ int ms_delete_invalid_items(sqlite3 *handle, const char *storage_id, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
        sqlite3_stmt *sql_stmt = NULL;
-       GArray *thumb_list = NULL;
+       GPtrArray *thumb_list = NULL;
+       char *path = NULL;
+       int i = 0;
 
        MS_DBG_RETVM_IF(!MS_STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
 
-       thumb_list = g_array_new(FALSE, FALSE, sizeof(char*));
+       thumb_list = g_ptr_array_new_with_free_func(g_free);
 
        char *sql = sqlite3_mprintf("SELECT media_thumbnail_path FROM '%q' WHERE validity IN (%d, %d) AND media_thumbnail_path IS NOT NULL", storage_id, MS_INVALID, MS_SCANNING);
 
@@ -387,9 +389,8 @@ int ms_delete_invalid_items(sqlite3 *handle, const char *storage_id, uid_t uid)
        MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "Query failed. err[%d]", ret);
 
        while (sqlite3_step(sql_stmt) == SQLITE_ROW) {
-               char *path = NULL;
                path = g_strdup((const char *)sqlite3_column_text(sql_stmt, 0));
-               g_array_append_val(thumb_list, path);
+               g_ptr_array_add(thumb_list, path);
        }
 
        MS_SQLITE3_FINALIZE(sql_stmt);
@@ -399,31 +400,19 @@ int ms_delete_invalid_items(sqlite3 *handle, const char *storage_id, uid_t uid)
        ret = media_db_update_db_direct(sql, uid);
        MS_SQLITE3_SAFE_FREE(sql);
        if (ret != MS_MEDIA_ERR_NONE) {
-               while ((thumb_list != NULL) && (thumb_list->len != 0)) {
-                       char *thumb_path = NULL;
-                       thumb_path = g_array_index(thumb_list , char*, 0);
-                       g_array_remove_index(thumb_list, 0);
-                       MS_SAFE_FREE(thumb_path);
-               }
-               g_array_free(thumb_list, false);
-               thumb_list = NULL;
+               g_ptr_array_free(thumb_list, TRUE);
                return ret;
        }
 
        /*Delete thumbnails*/
-       while ((thumb_list != NULL) && (thumb_list->len != 0)) {
-               char *thumb_path = NULL;
-               thumb_path = g_array_index(thumb_list , char*, 0);
-               g_array_remove_index(thumb_list, 0);
+       for (i = 0; i < thumb_list->len; i++) {
+               path = g_ptr_array_index(thumb_list, i);
 
-               if (remove(thumb_path) != 0)
+               if (remove(path) != 0)
                        MS_DBG_ERR("fail to remove thumbnail file.");
-
-               MS_SAFE_FREE(thumb_path);
        }
 
-       g_array_free(thumb_list, false);
-       thumb_list = NULL;
+       g_ptr_array_free(thumb_list, TRUE);
 
        return MS_MEDIA_ERR_NONE;
 }