From d1e5285957eef42faebced30f5ab2387b3ab45bb Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 9 May 2024 16:07:12 +0900 Subject: [PATCH] Use sqlite3 apis directly sqlite3_free() and sqlite3_finalize() include NULL checking. Removed SQLITE3_FINALIZE, and SQLITE3_SAFE_FREE. Change-Id: I8af5fbf767516a60cf48250379811038e22f8e05 Signed-off-by: Minje Ahn --- include/media_info_private.h | 2 -- include_product/media_info_private.h | 2 -- packaging/capi-content-media-content.spec | 2 +- src/media_bookmark.c | 16 +++++----- src/media_content.c | 2 +- src/media_db.c | 50 +++++++++++++++---------------- src/media_face.c | 16 +++++----- src/media_folder.c | 2 +- src/media_group.c | 2 +- src/media_info.c | 16 +++++----- src/media_playlist.c | 28 ++++++++--------- src/media_pvr.c | 2 +- src/media_tag.c | 12 ++++---- src/media_uhd.c | 4 +-- 14 files changed, 76 insertions(+), 80 deletions(-) diff --git a/include/media_info_private.h b/include/media_info_private.h index bf919c3..030884d 100644 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -57,8 +57,6 @@ extern "C" { #define LOG_TAG "CAPI_CONTENT_MEDIA_CONTENT" #define STRING_VALID(str) (str && strlen(str) > 0) -#define SQLITE3_FINALIZE(x) {if (x) sqlite3_finalize(x); } -#define SQLITE3_SAFE_FREE(x) {if (x) {sqlite3_free(x); x = NULL; } } #define MAX_QUERY_SIZE 4096 #define MAX_PATH_LEN 4096 diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index 9c78007..7ee1d8a 100644 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -60,8 +60,6 @@ extern "C" { #define LOG_TAG "CAPI_CONTENT_MEDIA_CONTENT" #define STRING_VALID(str) (str && strlen(str) > 0) -#define SQLITE3_FINALIZE(x) {if (x) sqlite3_finalize(x); } -#define SQLITE3_SAFE_FREE(x) {if (x) {sqlite3_free(x); x = NULL; } } #define MAX_QUERY_SIZE 4096 #define MAX_PATH_LEN 4096 diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index 021915c..e612f7c 100644 --- a/packaging/capi-content-media-content.spec +++ b/packaging/capi-content-media-content.spec @@ -1,6 +1,6 @@ Name: capi-content-media-content Summary: A Media content library in Tizen Native API -Version: 0.5.4 +Version: 0.5.5 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/media_bookmark.c b/src/media_bookmark.c index fdc16e0..3ba53cd 100755 --- a/src/media_bookmark.c +++ b/src/media_bookmark.c @@ -29,13 +29,13 @@ static int __media_bookmark_check_media_id(const char *media_id) query_str = sqlite3_mprintf(SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID, media_id); ret = _content_get_result(query_str, &stmt); - SQLITE3_SAFE_FREE(query_str); + sqlite3_free(query_str); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) item_count = (int)sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); content_retvm_if(item_count == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_id"); @@ -52,7 +52,7 @@ int media_bookmark_insert_to_db(const char *media_id, time_t time, const char *t sql = sqlite3_mprintf(INSERT_BOOKMARK_TO_BOOKMARK, media_id, time, thumbnail_path, ""); ret = _content_query_sql(sql); - SQLITE3_SAFE_FREE(sql); + sqlite3_free(sql); return ret; } @@ -67,7 +67,7 @@ int media_bookmark_delete_from_db(int bookmark_id) query_str = sqlite3_mprintf(DELETE_BOOKMARK_FROM_BOOKMARK, bookmark_id); ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); + sqlite3_free(query_str); return ret; } @@ -199,7 +199,7 @@ int media_bookmark_update_to_db(media_bookmark_h bookmark) sql = sqlite3_mprintf(UPDATE_BOOKMARK_FROM_BOOKMARK, _bookmark->name, _bookmark->bookmark_id); ret = _content_query_sql(sql); - SQLITE3_SAFE_FREE(sql); + sqlite3_free(sql); return ret; } @@ -254,18 +254,18 @@ int media_bookmark_insert_to_db_v2(media_bookmark_h bookmark) _bookmark->media_id, _bookmark->marked_time, _bookmark->thumbnail_path, _bookmark->name); ret = _content_query_sql(sql); - SQLITE3_SAFE_FREE(sql); + sqlite3_free(sql); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); sql = sqlite3_mprintf(SELECT_BOOKMARK_ID_FROM_BOOKMARK, _bookmark->media_id, _bookmark->marked_time); ret = _content_get_result(sql, &stmt); - SQLITE3_SAFE_FREE(sql); + sqlite3_free(sql); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) bookmark_id = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); _bookmark->bookmark_id = bookmark_id; diff --git a/src/media_content.c b/src/media_content.c index 90c9e27..a65bb0b 100644 --- a/src/media_content.c +++ b/src/media_content.c @@ -53,7 +53,7 @@ int _content_query_prepare(const char *select_query, const char *condition_query } ret = _content_get_result(query, stmt); - SQLITE3_SAFE_FREE(query); + sqlite3_free(query); return ret; } diff --git a/src/media_db.c b/src/media_db.c index 62f001f..66ef81a 100755 --- a/src/media_db.c +++ b/src/media_db.c @@ -256,7 +256,7 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro if (sqlite3_step(stmt) == SQLITE_ROW) *group_count = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -306,7 +306,7 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g if (sqlite3_step(stmt) == SQLITE_ROW) *group_count = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -356,7 +356,7 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_ g_free(name); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -416,7 +416,7 @@ int _media_db_get_media_group_and_count(media_group_e group, filter_h filter, me g_free(name); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -474,7 +474,7 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro if (sqlite3_step(stmt) == SQLITE_ROW) *group_count = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -504,7 +504,7 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g if (sqlite3_step(stmt) == SQLITE_ROW) *group_count = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -543,7 +543,7 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_ g_free(name); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -593,7 +593,7 @@ int _media_db_get_album(filter_h filter, media_album_cb callback, void *user_dat media_album_destroy((media_album_h)album); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -641,7 +641,7 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d media_folder_destroy((media_folder_h) _folder); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -675,7 +675,7 @@ int _media_db_get_playlist(filter_h filter, media_playlist_cb callback, void *us media_playlist_destroy((media_playlist_h)_playlist); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -718,7 +718,7 @@ int _media_db_get_playlist_item(int playlist_id, filter_h filter, playlist_membe } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -761,7 +761,7 @@ int _media_db_get_tag(const char *media_id, filter_h filter, media_tag_cb callba media_tag_destroy((media_tag_h)_tag); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -822,7 +822,7 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark media_bookmark_destroy((media_bookmark_h)bookmark); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; @@ -886,7 +886,7 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call media_face_destroy((media_face_h)face); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; @@ -942,7 +942,7 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li if (sqlite3_step(stmt) == SQLITE_ROW) *item_count = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -1054,7 +1054,7 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou if (sqlite3_step(stmt) == SQLITE_ROW) *item_count = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -1134,7 +1134,7 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb media_info_destroy((media_info_h)item); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -1203,7 +1203,7 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info media_info_destroy((media_info_h)item); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -1281,7 +1281,7 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter if (sqlite3_step(stmt) == SQLITE_ROW) *item_count = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -1333,7 +1333,7 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi media_info_destroy((media_info_h)item); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -1348,7 +1348,7 @@ int _media_db_get_storage_id_by_media_id(const char *media_id, char **storage_id select_query = sqlite3_mprintf(SELECT_MEDIA_STORAGE_ID_BY_ID, media_id); ret = _content_get_result(select_query, &stmt); - SQLITE3_SAFE_FREE(select_query); + sqlite3_free(select_query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) { @@ -1358,7 +1358,7 @@ int _media_db_get_storage_id_by_media_id(const char *media_id, char **storage_id ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -1503,7 +1503,7 @@ int _media_db_get_pvr(filter_h filter, media_pvr_cb callback, void *user_data) media_pvr_destroy((media_pvr_h) _pvr); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -1575,7 +1575,7 @@ int _media_db_get_uhd(filter_h filter, media_uhd_cb callback, void *user_data) media_uhd_destroy((media_uhd_h) _uhd); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -1609,7 +1609,7 @@ int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user media_storage_destroy((media_storage_h) _storage); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } diff --git a/src/media_face.c b/src/media_face.c index fdcbe15..144eee6 100755 --- a/src/media_face.c +++ b/src/media_face.c @@ -31,13 +31,13 @@ static int __media_face_check_media_id(const char *media_id) /* Get image count */ query_str = sqlite3_mprintf(SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID, media_id); ret = _content_get_result(query_str, &stmt); - SQLITE3_SAFE_FREE(query_str); + sqlite3_free(query_str); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) item_count = (int)sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); content_retvm_if(item_count == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_id"); @@ -240,17 +240,17 @@ int media_face_insert_to_db(media_face_h face) query_str = sqlite3_mprintf(INSERT_FACE_TO_FACE, _face->media_id, _face->face_rect_x, _face->face_rect_y, _face->face_rect_w, _face->face_rect_h, _face->orientation, _face->face_tag); ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); + sqlite3_free(query_str); query_str = sqlite3_mprintf(SELECT_FACE_ID, _face->media_id, _face->face_rect_x, _face->face_rect_y, _face->face_rect_w, _face->face_rect_h, _face->orientation); ret = _content_get_result(query_str, &stmt); - SQLITE3_SAFE_FREE(query_str); + sqlite3_free(query_str); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) _face->face_id = (int)sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; @@ -273,7 +273,7 @@ int media_face_update_to_db(media_face_h face) query_str = sqlite3_mprintf(UPDATE_FACE_TO_FACE, _face->face_rect_x, _face->face_rect_y, _face->face_rect_w, _face->face_rect_h, _face->orientation, _face->face_tag, _face->face_id); ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); + sqlite3_free(query_str); return ret; } @@ -312,12 +312,12 @@ int media_face_delete_from_db(const char *face_id) /*Update modified_time to 0.. It will restore the deleted face when media_info_start_face_detection() is called */ query_str = sqlite3_mprintf(UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST, query_face_id); ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); + sqlite3_free(query_str); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); query_str = sqlite3_mprintf(DELETE_FACE_FROM_FACE, query_face_id); ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); + sqlite3_free(query_str); return ret; } diff --git a/src/media_folder.c b/src/media_folder.c index 2d51788..a3df405 100755 --- a/src/media_folder.c +++ b/src/media_folder.c @@ -199,7 +199,7 @@ int media_folder_get_folder_from_db(const char *folder_id, media_folder_h *folde *folder = (media_folder_h)_folder; } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } diff --git a/src/media_group.c b/src/media_group.c index 98f1eb5..1b7e23e 100755 --- a/src/media_group.c +++ b/src/media_group.c @@ -74,7 +74,7 @@ int media_album_get_album_from_db(int album_id, media_album_h *album) *album = (media_album_h)_album; } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } diff --git a/src/media_info.c b/src/media_info.c index 727e24a..90f4827 100644 --- a/src/media_info.c +++ b/src/media_info.c @@ -272,7 +272,7 @@ int _media_info_get_media_info_from_db(const char *path, const char *storage_id, select_query = sqlite3_mprintf(SELECT_MEDIA_BY_PATH, storage_id, path); ret = _content_get_result(select_query, &stmt); - SQLITE3_SAFE_FREE(select_query); + sqlite3_free(select_query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) { @@ -282,7 +282,7 @@ int _media_info_get_media_info_from_db(const char *path, const char *storage_id, ret = MEDIA_CONTENT_ERROR_DB_FAILED; } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -300,7 +300,7 @@ int _media_info_get_media_info_from_db(const char *path, media_info_h media) select_query = sqlite3_mprintf(SELECT_MEDIA_BY_PATH, path); ret = _content_get_result(select_query, &stmt); - SQLITE3_SAFE_FREE(select_query); + sqlite3_free(select_query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) { @@ -310,7 +310,7 @@ int _media_info_get_media_info_from_db(const char *path, media_info_h media) ret = MEDIA_CONTENT_ERROR_DB_FAILED; } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -426,7 +426,7 @@ static int __media_info_get_media_path_by_id_from_db(const char *media_id, char select_query = sqlite3_mprintf(SELECT_MEDIA_PATH_BY_ID, media_id); ret = _content_get_result(select_query, &stmt); - SQLITE3_SAFE_FREE(select_query); + sqlite3_free(select_query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) { @@ -437,7 +437,7 @@ static int __media_info_get_media_path_by_id_from_db(const char *media_id, char ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -1203,7 +1203,7 @@ int media_info_get_media_from_db(const char *media_id, media_info_h *media) ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -1276,7 +1276,7 @@ int media_info_update_to_db(media_info_h media) sql = sqlite3_mprintf("UPDATE %q SET media_favourite=%d WHERE media_id=%Q", DB_TABLE_MEDIA, _media->favourite, _media->media_id); #endif ret = _content_query_sql(sql); - SQLITE3_SAFE_FREE(sql); + sqlite3_free(sql); if (ret == MEDIA_CONTENT_ERROR_NONE) { /* Send notification for this update */ diff --git a/src/media_playlist.c b/src/media_playlist.c index fce4acc..bda7c96 100755 --- a/src/media_playlist.c +++ b/src/media_playlist.c @@ -49,19 +49,19 @@ static int __media_playlist_insert_playlist_record(const char *playlist_name, in query = sqlite3_mprintf(INSERT_PLAYLIST_TO_PLAYLIST, playlist_name); ret = _content_query_sql(query); - SQLITE3_SAFE_FREE(query); + sqlite3_free(query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); query = sqlite3_mprintf(SELECT_PLAYLIST_ID_FROM_PLAYLIST, playlist_name); ret = _content_get_result(query, &stmt); - SQLITE3_SAFE_FREE(query); + sqlite3_free(query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) *playlist_id = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return MEDIA_CONTENT_ERROR_NONE; } @@ -77,13 +77,13 @@ static int __media_playlist_insert_item_to_playlist(int playlist_id, const char /* get the max play_order */ ret = _content_get_result(query, &stmt); - SQLITE3_SAFE_FREE(query); + sqlite3_free(query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) play_order = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); query = sqlite3_mprintf(INSERT_PLAYLIST_ITEM_TO_PLAYLIST_MAP, playlist_id, media_id, ++play_order); ret = media_svc_append_query(query, _content_get_uid()); @@ -254,7 +254,7 @@ int media_playlist_delete_from_db(int playlist_id) query_str = sqlite3_mprintf(DELETE_PLAYLIST_FROM_PLAYLIST, playlist_id); ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); + sqlite3_free(query_str); return ret; } @@ -340,7 +340,7 @@ int media_playlist_get_playlist_from_db(int playlist_id, media_playlist_h *playl query = sqlite3_mprintf(SELECT_PLAYLIST_FROM_PLAYLIST, playlist_id); ret = _content_get_result(query, &stmt); - SQLITE3_SAFE_FREE(query); + sqlite3_free(query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); media_playlist_s *_playlist = NULL; @@ -358,7 +358,7 @@ int media_playlist_get_playlist_from_db(int playlist_id, media_playlist_h *playl ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -416,13 +416,13 @@ int media_playlist_get_play_order(media_playlist_h playlist, int playlist_member query = sqlite3_mprintf(SELECT_PLAY_ORDER_FROM_PLAYLIST_VIEW, _playlist->playlist_id, playlist_member_id); ret = _content_get_result(query, &stmt); - SQLITE3_SAFE_FREE(query); + sqlite3_free(query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) *play_order = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -601,13 +601,13 @@ static int __media_playlist_get_media_id_by_path(const char *path, char **media_ query = sqlite3_mprintf("SELECT media_id FROM '%q' WHERE media_path='%q'", DB_TABLE_MEDIA, path); #endif ret = _content_get_result(query, &stmt); - SQLITE3_SAFE_FREE(query); + sqlite3_free(query); content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "Failed to get media_id"); if (sqlite3_step(stmt) == SQLITE_ROW) *media_id = g_strdup((const char *)sqlite3_column_text(stmt, 0)); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -727,13 +727,13 @@ int media_playlist_get_play_order_v2(int playlist_id, int playlist_member_id, in query = sqlite3_mprintf(SELECT_PLAY_ORDER_FROM_PLAYLIST_VIEW, playlist_id, playlist_member_id); ret = _content_get_result(query, &stmt); - SQLITE3_SAFE_FREE(query); + sqlite3_free(query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) *play_order = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } diff --git a/src/media_pvr.c b/src/media_pvr.c index 58b1735..b1507e2 100755 --- a/src/media_pvr.c +++ b/src/media_pvr.c @@ -141,7 +141,7 @@ int media_pvr_get_pvr_from_db(const char *media_id, media_pvr_h *pvr) ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } diff --git a/src/media_tag.c b/src/media_tag.c index 8286b15..6b25565 100755 --- a/src/media_tag.c +++ b/src/media_tag.c @@ -81,7 +81,7 @@ static int __media_tag_get_tag_info_from_db(const char *name, media_tag_h tag) select_query = sqlite3_mprintf(SELECT_TAG_BY_NAME, name); ret = _content_get_result(select_query, &stmt); - SQLITE3_SAFE_FREE(select_query); + sqlite3_free(select_query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) { @@ -92,7 +92,7 @@ static int __media_tag_get_tag_info_from_db(const char *name, media_tag_h tag) ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -109,7 +109,7 @@ int media_tag_insert_to_db(const char *tag_name, media_tag_h *tag) query_str = sqlite3_mprintf(INSERT_TAG_TO_TAG, tag_name); ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); + sqlite3_free(query_str); content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "fail to insert tag"); _tag = g_new0(media_tag_s, 1); @@ -131,7 +131,7 @@ int media_tag_delete_from_db(int tag_id) query_str = sqlite3_mprintf(DELETE_TAG_FROM_TAG, tag_id); ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); + sqlite3_free(query_str); return ret; } @@ -242,7 +242,7 @@ int media_tag_get_tag_from_db(int tag_id, media_tag_h *tag) query = sqlite3_mprintf(SELECT_TAG_FROM_TAG, tag_id); ret = _content_get_result(query, &stmt); - SQLITE3_SAFE_FREE(query); + sqlite3_free(query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); if (sqlite3_step(stmt) == SQLITE_ROW) { @@ -257,7 +257,7 @@ int media_tag_get_tag_from_db(int tag_id, media_tag_h *tag) ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } diff --git a/src/media_uhd.c b/src/media_uhd.c index 2cdd96c..5a9b282 100755 --- a/src/media_uhd.c +++ b/src/media_uhd.c @@ -79,7 +79,7 @@ int media_uhd_get_uhd_from_db(const char *media_id, media_uhd_h *uhd) select_query = sqlite3_mprintf(SELECT_UHD_FROM_UHD, media_id); ret = _content_get_result(select_query, &stmt); - SQLITE3_SAFE_FREE(select_query); + sqlite3_free(select_query); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); media_uhd_s *_uhd = NULL; @@ -95,7 +95,7 @@ int media_uhd_get_uhd_from_db(const char *media_id, media_uhd_h *uhd) ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } -- 2.7.4