projects / platform / core / api / media-content.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove senior mode
[platform/core/api/media-content.git] / src / media_content.c
diff --git a/src/media_content.c b/src/media_content.c
index da5b730..8b2b3af 100644 (file)
--- a/src/media_content.c
+++ b/src/media_content.c
@@ -41,7 +41,7 @@ int _content_query_prepare(const char *select_query, const char *condition_query
        int ret = MEDIA_CONTENT_ERROR_NONE;
        char *query = NULL;
 
-       content_retvm_if(!STRING_VALID(select_query), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid select_query");
+       content_retip_if_fail(select_query);
 
        /* If 'option_query' is NULL, 'condition_query' is also NULL. */
        if (option_query) {
@@ -64,8 +64,8 @@ int _content_get_result(char *query, sqlite3_stmt **stmt)
 {
        int err = MEDIA_CONTENT_ERROR_NONE;
 
-       content_retvm_if(_content_get_db_handle() == NULL, MEDIA_CONTENT_ERROR_DB_FAILED, "database is not connected");
-       content_retvm_if(!STRING_VALID(query), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid query");
+       content_retip_if_fail(_content_get_db_handle());
+       content_retip_if_fail(query);
 
        content_sec_debug("Query[%s]", query);
 
@@ -83,62 +83,6 @@ int _content_get_result(char *query, sqlite3_stmt **stmt)
        return MEDIA_CONTENT_ERROR_NONE;
 }
 
-#ifdef _USE_SENIOR_MODE
-int _content_query_prepare_by_union_select(sqlite3_stmt **stmt, char *select_query1, char *condition_query1, char *option_query1, char *select_query2, char *condition_query2, char *option_query2)
-{
-       int len = 0;
-       int err = MEDIA_CONTENT_ERROR_NONE;
-       char query[MAX_QUERY_SIZE] = {0, };
-
-       content_retvm_if(_content_get_db_handle() == NULL, MEDIA_CONTENT_ERROR_DB_FAILED, "database is not connected");
-       content_retvm_if(!STRING_VALID(select_query1), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid select_query1");
-       content_retvm_if(!STRING_VALID(select_query2), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid select_query2");
-
-       if (!STRING_VALID(condition_query1))
-               condition_query1 = (char *)" ";
-
-       if (!STRING_VALID(option_query1))
-               option_query1 = (char *)" ";
-
-       if (!STRING_VALID(condition_query2))
-               condition_query2 = (char *)" ";
-
-       if (!STRING_VALID(option_query2))
-               option_query2 = (char *)" ";
-
-       len = snprintf(query, sizeof(query), "SELECT * FROM (%s %s %s) as table1 UNION ALL SELECT * FROM (%s %s %s) as table2",
-                       select_query1, condition_query1, option_query1, select_query2, condition_query2, option_query2);
-       if (len > 0 && len < sizeof(query)) {
-               query[len] = '\0';
-       } else if (len >= sizeof(query)) {
-               query[MAX_QUERY_SIZE -1] = '\0';
-       } else {
-               content_error("snprintf failed");
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       content_sec_debug("Query : [%s]", query);
-
-       err = sqlite3_prepare_v2(_content_get_db_handle(), query, strlen(query), stmt, NULL);
-       if (err != SQLITE_OK) {
-               content_error("DB_FAILED(0x%08x) fail to sqlite3_prepare(), %s", MEDIA_CONTENT_ERROR_DB_FAILED, sqlite3_errmsg(_content_get_db_handle()));
-
-               if (err == SQLITE_BUSY) {
-                       content_error(" BUSY ERROR");
-                       return MEDIA_CONTENT_ERROR_DB_BUSY;
-               } else if (err == SQLITE_PERM) {
-                       content_error("PERMISSION EROR");
-                       return MEDIA_CONTENT_ERROR_PERMISSION_DENIED;
-               } else {
-                       content_error("OTHER ERROR");
-                       return MEDIA_CONTENT_ERROR_DB_FAILED;
-               }
-       }
-
-       return MEDIA_CONTENT_ERROR_NONE;
-}
-#endif
-
 int _content_error_capi(int internal_error)
 {
        if (internal_error == MS_MEDIA_ERR_NONE)
@@ -253,7 +197,7 @@ int media_content_scan_file(const char *path)
        char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0,};
        char repl_path[MAX_PATH_LEN] = {0,};
 
-       content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid path");
+       content_retip_if_fail(STRING_VALID(path));
 
        content_sec_debug("Path : %s", path);
 
@@ -351,7 +295,7 @@ void _media_content_scan_cb(media_request_result_s* result, void *user_data)
                        content_debug("end:User callback is being called now, result=%d", err);
                }
 
-               SAFE_FREE(cb_data);
+               g_free(cb_data);
        }
 #else
        if (cb_data && cb_data->callback) {
@@ -359,7 +303,7 @@ void _media_content_scan_cb(media_request_result_s* result, void *user_data)
                cb_data->callback(err, cb_data->user_data);
        }
 
-       SAFE_FREE(cb_data);
+       g_free(cb_data);
 #endif
 
        return;
@@ -393,7 +337,7 @@ void _media_content_scan_cb_v2(media_request_result_s* result, void *user_data)
        if ((result->request_type != MEDIA_REQUEST_SCAN_COMPLETE) &&
        (result->request_type != MEDIA_REQUEST_SCAN_PARTIAL) &&
        (result->request_type != MEDIA_RECURSIVE_START))
-               SAFE_FREE(cb_data);
+               g_free(cb_data);
 
        return;
 }
@@ -406,7 +350,8 @@ int media_content_scan_folder(const char *path, bool is_recursive, media_scan_co
        char repl_path[MAX_PATH_LEN] = {0, };
        ms_user_storage_type_e storage_type = MS_USER_STORAGE_INTERNAL;
 
-       content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path");
+       content_retip_if_fail(STRING_VALID(path));
+       content_retip_if_fail(callback);
 
        ret = _media_content_replace_path(path, repl_path);
        content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
@@ -436,8 +381,7 @@ int media_content_scan_folder(const char *path, bool is_recursive, media_scan_co
        }
 
        media_content_scan_cb_data *cb_data = NULL;
-       cb_data = (media_content_scan_cb_data *)malloc(sizeof(media_content_scan_cb_data));
-       content_retvm_if(cb_data == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+       cb_data = g_new0(media_content_scan_cb_data, 1);
 
        cb_data->callback = callback;
        cb_data->user_data = user_data;
@@ -445,7 +389,7 @@ int media_content_scan_folder(const char *path, bool is_recursive, media_scan_co
        ret = media_directory_scanning_async(repl_path, storage_id, is_recursive, _media_content_scan_cb, cb_data, _content_get_uid());
        if (ret != MS_MEDIA_ERR_NONE) {
                content_error("media_directory_scanning_async failed : %d", ret);
-               SAFE_FREE(cb_data);
+               g_free(cb_data);
        }
 
        return _content_error_capi(ret);
@@ -457,7 +401,9 @@ int media_content_scan_folder_v2(const char *path, bool is_recursive, media_scan
        int ret = MEDIA_CONTENT_ERROR_NONE;
        char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, };
 
-       content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path");
+       content_retip_if_fail(STRING_VALID(path));
+       content_retip_if_fail(callback);
+
        content_retvm_if(_media_util_is_ignorable_dir(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid folder path");
 
        ret = _media_content_check_dir(path);
@@ -465,8 +411,7 @@ int media_content_scan_folder_v2(const char *path, bool is_recursive, media_scan
        content_retvm_if(ret == MEDIA_CONTENT_ERROR_INVALID_PARAMETER, ret, "invalid path[%s]", path);
 
        media_content_scan_cb_data_v2* cb_data = NULL;
-       cb_data = (media_content_scan_cb_data_v2*)malloc(sizeof(media_content_scan_cb_data_v2));
-       content_retvm_if(cb_data == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+       cb_data = g_new0(media_content_scan_cb_data_v2, 1);
 
        cb_data->callback = callback;
        cb_data->user_data = user_data;
@@ -487,7 +432,7 @@ int media_content_cancel_scan_folder(const char *path)
        int ret = MEDIA_CONTENT_ERROR_NONE;
        char repl_path[MAX_PATH_LEN] = {0, };
 
-       content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path");
+       content_retip_if_fail(STRING_VALID(path));
 
        ret = _media_content_replace_path(path, repl_path);
        content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
@@ -529,18 +474,17 @@ int media_content_add_db_updated_cb(media_content_db_update_cb callback, void *u
        int ret = MEDIA_CONTENT_ERROR_NONE;
        media_noti_cb_s *noti_info = NULL;
 
-       content_retvm_if(noti_handle == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "handle is NULL");
-       content_retvm_if(callback == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "callback is NULL");
+       content_retip_if_fail(callback);
+       content_retip_if_fail(noti_handle);
 
-       noti_info = (media_noti_cb_s *)calloc(1, sizeof(media_noti_cb_s));
-       content_retvm_if(noti_info == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Failed to create noti info");
+       noti_info = g_new0(media_noti_cb_s, 1);
 
        noti_info->update_noti_cb = callback;
        noti_info->user_data = user_data;
 
        ret = media_db_update_subscribe((MediaNotiHandle*)noti_handle, _media_content_db_update_noti_cb, (void *)noti_info);
        if (ret != MS_MEDIA_ERR_NONE)
-               SAFE_FREE(noti_info);
+               g_free(noti_info);
 
        return _content_error_capi(ret);
 }
Domain: Multimedia / Media Content;