From e57f13300f6c2f5b3b81ecdb7888416da4b2e1a1 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Tue, 21 May 2024 12:56:44 +0900 Subject: [PATCH] Use sqlite APIs directly sqlite APIs already checked input value. So no need macro. Change-Id: I662a6a5a04ba9d98ac66fdb52ec8f310eb568438 Signed-off-by: Minje Ahn --- include/media_controller_private.h | 11 ++---- packaging/capi-media-controller.spec | 2 +- src/media_controller_db.c | 76 ++++++++++++++++++------------------ svc/media_controller_db_util.c | 40 +++++++++---------- svc/media_controller_socket.c | 4 +- 5 files changed, 64 insertions(+), 69 deletions(-) diff --git a/include/media_controller_private.h b/include/media_controller_private.h index a925a4c..52ff2a3 100644 --- a/include/media_controller_private.h +++ b/include/media_controller_private.h @@ -128,15 +128,13 @@ extern "C" { } \ } while (0) -#define MC_SAFE_STRLCPY(dst, src, n) g_strlcpy(dst, src, n); - -#define MC_STRING_VALID(str) ((str != NULL && strlen(str) > 0) ? TRUE : FALSE) -#define MC_STRING_DELIMITER "VAL_SEP" +#define MC_STRING_VALID(str) (str && strlen(str) > 0) +#define MC_STRING_DELIMITER "VAL_SEP" #define MC_DB_NAME ".media_controller.db" /* USER VERSION */ -#define MC_DB_USER_V1 1 /* Tizen 5.5 */ +#define MC_DB_USER_V1 1 #define MC_DB_LATEST_VERSION MC_DB_USER_V1 @@ -155,9 +153,6 @@ extern "C" { #define META_LIST "title, artist, album, author, genre, duration, date, copyright, description, track_num, picture, season, episode, resolution" #define META_COL "title TEXT, artist TEXT, album TEXT, author TEXT, genre TEXT, duration INTEGER DEFAULT 0, date TEXT, copyright TEXT, description TEXT, track_num TEXT, picture TEXT, season TEXT, episode TEXT, resolution TEXT" -#define SQLITE3_SAFE_FREE(sql_string) {if (sql_string) { sqlite3_free(sql_string); sql_string = NULL; } } -#define SQLITE3_FINALIZE(x) {if (x != NULL) { sqlite3_finalize(x); x = NULL; } } - /** * @ingroup CAPI_MEDIA_CONTROLLER_MODULE * @brief DBus path for media controller. diff --git a/packaging/capi-media-controller.spec b/packaging/capi-media-controller.spec index 61f1c2c..10fc19c 100644 --- a/packaging/capi-media-controller.spec +++ b/packaging/capi-media-controller.spec @@ -1,7 +1,7 @@ Name: capi-media-controller Summary: A media controller library in Tizen Native API Version: 1.0.1 -Release: 2 +Release: 3 Group: Multimedia/API License: Apache-2.0 Source0: %{name}-%{version}.tar.gz diff --git a/src/media_controller_db.c b/src/media_controller_db.c index ddf7f23..a7fdf5f 100644 --- a/src/media_controller_db.c +++ b/src/media_controller_db.c @@ -42,7 +42,7 @@ static int __mc_db_get_record(sqlite3 *handle, const char *sql_str, sqlite3_stmt if (sqlite3_step(statement) != SQLITE_ROW) { mc_error("end of row [%s]", sqlite3_errmsg(handle)); - SQLITE3_FINALIZE(statement); + sqlite3_finalize(statement); /* Error for server metadata. So, other functions need to change TIZEN_ERROR_NO_DATA to MEDIA_CONTROLLER_ERROR_INVALID_OPERATION. */ return TIZEN_ERROR_NO_DATA; } @@ -65,11 +65,11 @@ static int __mc_db_get_int_value(sqlite3 *handle, const char *server_name, const sql_str = sqlite3_mprintf("SELECT %q FROM %q WHERE name=%Q", column, MC_DB_TABLE_SERVER_INFO, server_name); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "__mc_db_get_record failed [%d]", ret); *value = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return MEDIA_CONTROLLER_ERROR_NONE; } @@ -235,12 +235,12 @@ int _mc_db_get_latest_server_info(sqlite3 *handle, char **latest_server_name, mc sql_str = sqlite3_mprintf("SELECT name, server_state FROM %q WHERE name IN (SELECT name FROM %q)", MC_DB_TABLE_SERVER_INFO, MC_DB_TABLE_LATEST_SERVER); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); if (ret == MEDIA_CONTROLLER_ERROR_NONE) { *latest_server_name = g_strdup((const char *)sqlite3_column_text(stmt, 0)); *state = sqlite3_column_int(stmt, 1); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); } else if (ret == TIZEN_ERROR_NO_DATA) { mc_info("No latest server"); ret = MEDIA_CONTROLLER_ERROR_NONE; @@ -265,7 +265,7 @@ int _mc_db_get_playback_info(sqlite3 *handle, const char *server_name, mc_playba MC_DB_TABLE_SERVER_INFO, server_name); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "__mc_db_get_record failed [%d]", ret); _playback = g_new0(media_controller_playback_s, 1); @@ -279,7 +279,7 @@ int _mc_db_get_playback_info(sqlite3 *handle, const char *server_name, mc_playba *playback = (mc_playback_h)_playback; - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return MEDIA_CONTROLLER_ERROR_NONE; } @@ -325,12 +325,12 @@ int _mc_db_get_metadata_info(sqlite3 *handle, const char *server_name, mc_metada sql_str = sqlite3_mprintf("SELECT %s FROM %q WHERE name=%Q", META_LIST, MC_DB_TABLE_LATEST_META, server_name); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret == TIZEN_ERROR_NO_DATA, MEDIA_CONTROLLER_ERROR_NONE, "no metadata info"); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "__mc_db_get_record failed [%d]", ret); ret = __mc_db_get_metadata(stmt, 0, metadata); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -356,11 +356,11 @@ int _mc_db_get_icon_uri(sqlite3 *handle, const char *server_name, char **uri) sql_str = sqlite3_mprintf("SELECT icon_uri FROM %q WHERE name=%Q", MC_DB_TABLE_SERVER_INFO, server_name); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "__mc_db_get_record failed [%d]", ret); *uri = g_strdup((const char *)sqlite3_column_text(stmt, 0)); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return MEDIA_CONTROLLER_ERROR_NONE; } @@ -378,12 +378,12 @@ static int __mc_db_get_ability(sqlite3 *handle, const char *server_name, unsigne sql_str = sqlite3_mprintf("SELECT ability_decided, ability_supported FROM %q WHERE name=%Q", MC_DB_TABLE_SERVER_INFO, server_name); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "__mc_db_get_record failed [%d]", ret); *decided = (unsigned long long)sqlite3_column_int64(stmt, 0); *supported = (unsigned long long)sqlite3_column_int64(stmt, 1); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return MEDIA_CONTROLLER_ERROR_NONE; @@ -509,11 +509,11 @@ int _mc_db_get_playlist_count(sqlite3 *handle, const char *server_name) sql_str = sqlite3_mprintf("SELECT COUNT(DISTINCT playlist_name) FROM %q WHERE server_name = %Q", MC_DB_TABLE_PLAYLIST, server_name); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, 0, "__mc_db_get_record failed [%d]", ret); count = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return count; } @@ -534,7 +534,7 @@ int _mc_db_get_foreach_playlist(sqlite3 *handle, const char *server_name, mc_pla mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null"); ret = sqlite3_prepare_v2(handle, sql_str, strlen(sql_str), &stmt, NULL); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(SQLITE_OK != ret, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "prepare error [%s]", sqlite3_errmsg(handle)); while (sqlite3_step(stmt) == SQLITE_ROW) { @@ -546,7 +546,7 @@ int _mc_db_get_foreach_playlist(sqlite3 *handle, const char *server_name, mc_pla playlists = g_list_append(playlists, _playlist); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); node = playlists; @@ -575,11 +575,11 @@ gboolean _mc_db_is_playlist_exist(sqlite3 *handle, const char *server_name, cons sql_str = sqlite3_mprintf("SELECT COUNT(*) FROM %q WHERE server_name=%Q AND playlist_name=%Q", MC_DB_TABLE_PLAYLIST, server_name, playlist_name); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, FALSE, "__mc_db_get_record failed [%d]", ret); ret = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return (ret == 0) ? FALSE : TRUE; } @@ -621,11 +621,11 @@ int _mc_db_get_playlist_item_count(sqlite3 *handle, const char *server_name, cha sql_str = sqlite3_mprintf("SELECT COUNT(*) FROM %q WHERE server_name=%Q AND playlist_name=%Q AND item_index IS NOT NULL", MC_DB_TABLE_PLAYLIST, server_name, playlist_name); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, 0, "__mc_db_get_record failed [%d]", ret); count = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return count; } @@ -648,7 +648,7 @@ int _mc_db_get_playlist_item(sqlite3 *handle, const char *server_name, char *pla mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null"); ret = sqlite3_prepare_v2(handle, sql_str, strlen(sql_str), &stmt, NULL); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(SQLITE_OK != ret, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "prepare error [%s]", sqlite3_errmsg(handle)); while (sqlite3_step(stmt) == SQLITE_ROW) { @@ -657,7 +657,7 @@ int _mc_db_get_playlist_item(sqlite3 *handle, const char *server_name, char *pla ret = __mc_db_get_metadata(stmt, 1, (mc_metadata_h *)&item->metadata); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("fail to __mc_db_get_metadata"); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); g_list_free_full(item_list, __mc_db_playlist_item_destroy); return ret; } @@ -667,7 +667,7 @@ int _mc_db_get_playlist_item(sqlite3 *handle, const char *server_name, char *pla item_list = g_list_append(item_list, item); } - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); length = g_list_length(item_list); for (idx = 0; idx < length; idx++) { @@ -694,11 +694,11 @@ gboolean _mc_db_is_exist_server(sqlite3 *handle, const char *server_name) sql_str = sqlite3_mprintf("SELECT COUNT(*) FROM %q WHERE name='%q'", MC_DB_TABLE_SERVER_INFO, server_name); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, FALSE, "__mc_db_get_record failed [%d]", ret); ret = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); if (ret == 0) { mc_secure_error("No server info [%s]", server_name); @@ -722,11 +722,11 @@ gboolean _mc_db_is_activated_client(sqlite3 *handle, const char *client_name) sql_str = sqlite3_mprintf("SELECT COUNT(*) FROM %q WHERE name='%q' AND type=%d", MC_DB_TABLE_APP_LIST, client_name, MC_PRIV_TYPE_CLIENT); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, FALSE, "__mc_db_get_record failed [%d]", ret); ret = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); if (ret == 0) { mc_secure_error("[%s] is not activated", client_name); @@ -750,11 +750,11 @@ gboolean _mc_db_is_activated_server(sqlite3 *handle, const char *server_name) sql_str = sqlite3_mprintf("SELECT COUNT(*) FROM %q WHERE name='%q' AND type=%d", MC_DB_TABLE_APP_LIST, server_name, MC_PRIV_TYPE_SERVER); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, FALSE, "__mc_db_get_record failed [%d]", ret); ret = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); if (ret == 0) { mc_secure_error("[%s] is not activated", server_name); @@ -778,11 +778,11 @@ gboolean _mc_db_is_latest_server(sqlite3 *handle, const char *server_name) sql_str = sqlite3_mprintf("SELECT COUNT(*) FROM %q WHERE name=%Q", MC_DB_TABLE_LATEST_SERVER, server_name); ret = __mc_db_get_record(handle, sql_str, &stmt); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, FALSE, "__mc_db_get_record failed [%d]", ret); ret = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return (ret == 0) ? FALSE : TRUE; } @@ -801,13 +801,13 @@ int _mc_db_foreach_server_list(sqlite3 *handle, mc_activated_server_cb callback, sql_str = sqlite3_mprintf("SELECT name FROM %q WHERE type=%d", MC_DB_TABLE_APP_LIST, MC_PRIV_TYPE_SERVER); mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null"); ret = sqlite3_prepare_v2(handle, sql_str, strlen(sql_str), &stmt, NULL); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(SQLITE_OK != ret, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "prepare error [%s]", sqlite3_errmsg(handle)); ret = sqlite3_step(stmt); if (SQLITE_ROW != ret) { mc_error("[No-Error] There is no server list [%s]", sqlite3_errmsg(handle)); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return MEDIA_CONTROLLER_ERROR_NONE; } @@ -827,7 +827,7 @@ int _mc_db_foreach_server_list(sqlite3 *handle, mc_activated_server_cb callback, mc_info("[ * Activated Server List - End * ]"); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); if (callback) { node = list; @@ -859,13 +859,13 @@ int _mc_db_foreach_client_list(sqlite3 *handle, mc_activated_client_cb callback, sql_str = sqlite3_mprintf("SELECT name FROM %q WHERE type=%d", MC_DB_TABLE_APP_LIST, MC_PRIV_TYPE_CLIENT); mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null"); ret = sqlite3_prepare_v2(handle, sql_str, strlen(sql_str), &stmt, NULL); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(SQLITE_OK != ret, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "prepare error [%s]", sqlite3_errmsg(handle)); ret = sqlite3_step(stmt); if (SQLITE_ROW != ret) { mc_error("[No-Error] There is no client list [%s]", sqlite3_errmsg(handle)); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return MEDIA_CONTROLLER_ERROR_NONE; } @@ -885,7 +885,7 @@ int _mc_db_foreach_client_list(sqlite3 *handle, mc_activated_client_cb callback, mc_info("[ * Activated Client List - End * ]"); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); if (callback) { node = list; diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c index fb52727..d3d7136 100644 --- a/svc/media_controller_db_util.c +++ b/svc/media_controller_db_util.c @@ -93,7 +93,7 @@ static int __mc_db_disable_journal_mode(sqlite3 *handle) mc_retvm_if(!MC_STRING_VALID(sql), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null"); ret = sqlite3_exec(handle, sql, NULL, NULL, NULL); - SQLITE3_SAFE_FREE(sql); + sqlite3_free(sql); mc_retvm_if(SQLITE_OK != ret, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL Error[%s] when change the journal mode", sqlite3_errmsg(handle)); return MEDIA_CONTROLLER_ERROR_NONE; @@ -113,13 +113,13 @@ static gboolean __mc_db_is_latest(sqlite3 *handle, const char *server_name) mc_retvm_if(!MC_STRING_VALID(sql_str), FALSE, "SQL string is null"); ret = sqlite3_prepare_v2(handle, sql_str, strlen(sql_str), &stmt, NULL); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(SQLITE_OK != ret, FALSE, "prepare error [%s]", sqlite3_errmsg(handle)); if (sqlite3_step(stmt) == SQLITE_ROW) is_latest = TRUE; - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return is_latest; } @@ -197,7 +197,7 @@ static int __mc_update_latest_server_info_to_db(sqlite3 *handle, mc_server_state } ret = mc_db_util_update_db(handle, sql_str); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to mc_db_util_update_db [%d]", ret); return __mc_update_latest_server_state_to_vconf(server_state, playback_state); @@ -232,7 +232,7 @@ static int __mc_db_activate_server(sqlite3 *db_handle, const char *app_id) } else { sql_str = sqlite3_mprintf("INSERT OR REPLACE INTO %q(name) VALUES (%Q)", MC_DB_TABLE_SERVER_INFO, app_id); ret = mc_db_util_update_db(db_handle, sql_str); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); } mc_debug_fleave(); @@ -258,7 +258,7 @@ static int __mc_db_insert_to_list(sqlite3 *db_handle, const char *app_id, mc_pri if (ret != MEDIA_CONTROLLER_ERROR_NONE) mc_error("mc_db_util_update_db error : %d", ret); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_debug_fleave(); @@ -283,7 +283,7 @@ static int __mc_db_delete_from_list(sqlite3 *db_handle, const char *app_id, mc_p if (ret != MEDIA_CONTROLLER_ERROR_NONE) mc_error("mc_db_util_update_db error : %d", ret); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_debug_fleave(); @@ -426,12 +426,12 @@ int mc_db_util_create_tables(sqlite3 *handle) /* TABLE */ sql_str = sqlite3_mprintf("CREATE TABLE IF NOT EXISTS %q(name TEXT PRIMARY KEY)", MC_DB_TABLE_LATEST_SERVER); ret = mc_db_util_update_db(handle, sql_str); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create latest_server table failed [%d]", ret); sql_str = sqlite3_mprintf("CREATE TABLE IF NOT EXISTS %s(name TEXT, type INTEGER, UNIQUE(name, type))", MC_DB_TABLE_APP_LIST); ret = mc_db_util_update_db(handle, sql_str); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create app_list table failed [%d]", ret); __mc_db_set_default_ability(&ability_decided, &ability_supported); @@ -466,21 +466,21 @@ int mc_db_util_create_tables(sqlite3 *handle) ability_supported); ret = mc_db_util_update_db(handle, sql_str); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create server_info table failed [%d]", ret); sql_str = sqlite3_mprintf("CREATE TABLE IF NOT EXISTS %s(name TEXT PRIMARY KEY, %s)", MC_DB_TABLE_LATEST_META, META_COL); ret = mc_db_util_update_db(handle, sql_str); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create latest_meta table failed [%d]", ret); sql_str = sqlite3_mprintf("CREATE TABLE IF NOT EXISTS %s(server_name TEXT NOT NULL, playlist_name TEXT NOT NULL, item_index TEXT, %s, unique(server_name, playlist_name, item_index))", MC_DB_TABLE_PLAYLIST, META_COL); ret = mc_db_util_update_db(handle, sql_str); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create playlist table failed [%d]", ret); /* TRIGGER */ @@ -488,14 +488,14 @@ int mc_db_util_create_tables(sqlite3 *handle) MC_DB_TRIGGER_PLAYLIST, MC_DB_TABLE_APP_LIST, MC_PRIV_TYPE_SERVER, MC_DB_TABLE_PLAYLIST); ret = mc_db_util_update_db(handle, sql_str); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create playlist trigger failed [%d]", ret); sql_str = sqlite3_mprintf("CREATE TRIGGER IF NOT EXISTS %s AFTER DELETE ON %s WHEN old.name NOT IN (SELECT name FROM %s) AND old.type=%d BEGIN DELETE FROM %s WHERE name=old.name;DELETE FROM %s WHERE name=old.name;END;", MC_DB_TRIGGER_SERVER, MC_DB_TABLE_APP_LIST, MC_DB_TABLE_LATEST_SERVER, MC_PRIV_TYPE_SERVER, MC_DB_TABLE_SERVER_INFO, MC_DB_TABLE_LATEST_META); ret = mc_db_util_update_db(handle, sql_str); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create playlist trigger failed [%d]", ret); return MEDIA_CONTROLLER_ERROR_NONE; @@ -519,7 +519,7 @@ int mc_db_util_update_db(sqlite3 *handle, const char *sql_str) break; mc_error("failed to update db[%d, %s]", ret, err_msg); - SQLITE3_SAFE_FREE(err_msg); + sqlite3_free(err_msg); if (ret == SQLITE_LOCKED && retry_count++ < RETRY_CNT) { @@ -547,7 +547,7 @@ int mc_db_util_delete_app_list(sqlite3 *handle) sql_str = sqlite3_mprintf("DELETE FROM %q", MC_DB_TABLE_APP_LIST); ret = mc_db_util_update_db(handle, sql_str); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Delete app_list failed [%d]", ret); return ret; @@ -568,7 +568,7 @@ int mc_db_util_get_user_version(sqlite3 *handle, int *version) if (sqlite3_step(stmt) == SQLITE_ROW) *version = sqlite3_column_int(stmt, 0); - SQLITE3_FINALIZE(stmt); + sqlite3_finalize(stmt); return ret; } @@ -580,7 +580,7 @@ int mc_db_util_set_user_version(sqlite3 *handle) sql_str = sqlite3_mprintf("PRAGMA user_version=%d", MC_DB_LATEST_VERSION); ret = mc_db_util_update_db(handle, sql_str); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Update user_version failed [%d]", ret); return ret; @@ -637,7 +637,7 @@ static void __make_playlist_query_cb(const char *key, const int type, const bun static void __sqlite3_safe_free(gpointer data) { - SQLITE3_SAFE_FREE(data); + sqlite3_free(data); } int __read_message_from_file(const gchar *path, gchar **data, size_t *size) @@ -886,7 +886,7 @@ int mc_db_request(uid_t uid, const char *data, int data_size) ret = __parse_db_request(params, &sql_str); if (ret == MEDIA_CONTROLLER_ERROR_NONE) { ret = __update_db_request(uid, params, sql_str); - SQLITE3_SAFE_FREE(sql_str); + sqlite3_free(sql_str); } g_strfreev(params); diff --git a/svc/media_controller_socket.c b/svc/media_controller_socket.c index afd5e87..758f577 100644 --- a/svc/media_controller_socket.c +++ b/svc/media_controller_socket.c @@ -42,7 +42,7 @@ int mc_ipc_create_client_socket(void) memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sun_family = AF_UNIX; - MC_SAFE_STRLCPY(serv_addr.sun_path, MC_IPC_PATH, sizeof(serv_addr.sun_path)); + g_strlcpy(serv_addr.sun_path, MC_IPC_PATH, sizeof(serv_addr.sun_path)); if (connect(sock, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) { mc_stderror("connect failed"); @@ -69,7 +69,7 @@ int mc_ipc_create_server_socket(void) memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sun_family = AF_UNIX; - MC_SAFE_STRLCPY(serv_addr.sun_path, MC_IPC_PATH, sizeof(serv_addr.sun_path)); + g_strlcpy(serv_addr.sun_path, MC_IPC_PATH, sizeof(serv_addr.sun_path)); for (i = 0; i < 20; i++) { if (bind(sock, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) == 0) { -- 2.7.4