From dfb2ec53ab46baadb3f01d94bb3a7d56b5797596 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Fri, 14 Jun 2019 12:30:29 +0900 Subject: [PATCH] Modify some error log Change-Id: Iaed608bebd12bc088fafa63785b681036c97074d Signed-off-by: Minje Ahn --- svc/media_controller_db_util.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c index 889cb30..a35038c 100644 --- a/svc/media_controller_db_util.c +++ b/svc/media_controller_db_util.c @@ -409,12 +409,12 @@ int mc_db_util_create_tables(sqlite3 *handle) 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); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create latest_server table failed!err= [%d]", ret); + 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); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create app_list table failed!err= [%d]", ret); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create app_list table failed [%d]", ret); sql_str = sqlite3_mprintf("CREATE TABLE IF NOT EXISTS %s(name TEXT PRIMARY KEY, server_state INTEGER DEFAULT 1,\ playback_state INTEGER DEFAULT 0, playback_position INTEGER DEFAULT 0,\ @@ -424,21 +424,21 @@ int mc_db_util_create_tables(sqlite3 *handle) ret = mc_db_util_update_db(handle, sql_str); SQLITE3_SAFE_FREE(sql_str); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create server_info table failed!err= [%d]", ret); + 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); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create latest_meta table failed!err= [%d]", ret); + 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); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create playlist table failed!err= [%d]", ret); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create playlist table failed [%d]", ret); /* TRIGGER */ sql_str = sqlite3_mprintf("CREATE TRIGGER IF NOT EXISTS %s AFTER DELETE ON %s WHEN old.type=%d BEGIN DELETE FROM %s WHERE server_name=old.name;END", @@ -446,14 +446,14 @@ int mc_db_util_create_tables(sqlite3 *handle) ret = mc_db_util_update_db(handle, sql_str); SQLITE3_SAFE_FREE(sql_str); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create playlist trigger failed!err= [%d]", ret); + 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); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create playlist trigger failed!err= [%d]", ret); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "create playlist trigger failed [%d]", ret); return MEDIA_CONTROLLER_ERROR_NONE; } @@ -496,7 +496,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); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Delete app_list failed!err= [%d]", ret); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Delete app_list failed [%d]", ret); return ret; } @@ -531,7 +531,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); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Update user_version failed!err= [%d]", ret); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Update user_version failed [%d]", ret); return ret; } -- 2.7.4