From 24cd4ee93577de9dc04c2e9f339e02fc90c8c9a3 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 1 Aug 2019 11:26:12 +0900 Subject: [PATCH] Change return type of mc_db_disconnect() Change-Id: I183a54a6d2154afdaa13e23def10e6c31c87289b Signed-off-by: Minje Ahn --- src/media_controller_client.c | 7 ++----- src/media_controller_server.c | 7 ++----- svc/include/media_controller_db_util.h | 2 +- svc/media_controller_db_util.c | 12 +++--------- svc/media_controller_svc.c | 17 +++++------------ 5 files changed, 13 insertions(+), 32 deletions(-) diff --git a/src/media_controller_client.c b/src/media_controller_client.c index ccfda07..5f4c560 100644 --- a/src/media_controller_client.c +++ b/src/media_controller_client.c @@ -401,11 +401,8 @@ static int __mc_client_destroy(media_controller_client_s *mc_client) mc_error("fail to mc_ipc_unref_dbus_connection"); } - if (mc_client->db_handle) { - ret = mc_db_disconnect(mc_client->db_handle); - if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("fail to mc_db_disconnect"); - } + if (mc_client->db_handle) + mc_db_disconnect(mc_client->db_handle); if (mc_client->listeners != NULL) g_list_free(mc_client->listeners); diff --git a/src/media_controller_server.c b/src/media_controller_server.c index fd5ec62..216538d 100644 --- a/src/media_controller_server.c +++ b/src/media_controller_server.c @@ -131,11 +131,8 @@ static int __mc_server_destoy(media_controller_server_s *mc_server) mc_error("fail to mc_ipc_unref_dbus_connection"); } - if (mc_server->db_handle) { - ret = mc_db_disconnect(mc_server->db_handle); - if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("fail to mc_db_disconnect"); - } + if (mc_server->db_handle) + mc_db_disconnect(mc_server->db_handle); if (mc_server->listeners != NULL) g_list_free(mc_server->listeners); diff --git a/svc/include/media_controller_db_util.h b/svc/include/media_controller_db_util.h index bed09aa..6960445 100644 --- a/svc/include/media_controller_db_util.h +++ b/svc/include/media_controller_db_util.h @@ -21,7 +21,7 @@ char *mc_db_get_db_path(uid_t uid); int mc_db_connect(sqlite3 **handle, uid_t uid, gboolean needwrite); -int mc_db_disconnect(sqlite3 *handle); +void mc_db_disconnect(sqlite3 *handle); int mc_db_util_check_integrity(sqlite3 *handle); int mc_db_util_remove_db(uid_t uid); diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c index f0027c4..7eec6ad 100644 --- a/svc/media_controller_db_util.c +++ b/svc/media_controller_db_util.c @@ -319,16 +319,10 @@ int mc_db_connect(sqlite3 **handle, uid_t uid, gboolean needwrite) return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_db_disconnect(sqlite3 *handle) +void mc_db_disconnect(sqlite3 *handle) { - int ret = SQLITE_OK; - - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); - - ret = sqlite3_close_v2(handle); - mc_retvm_if(SQLITE_OK != ret, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL Error[%s] when db open", sqlite3_errmsg(handle)); - - return MEDIA_CONTROLLER_ERROR_NONE; + if (handle) + sqlite3_close_v2(handle); } int mc_db_util_check_integrity(sqlite3 *handle) diff --git a/svc/media_controller_svc.c b/svc/media_controller_svc.c index f48f517..433695f 100644 --- a/svc/media_controller_svc.c +++ b/svc/media_controller_svc.c @@ -273,18 +273,13 @@ static int _mc_service_check_db(uid_t uid) } res = mc_db_util_check_integrity(db_handle); - if (res != MEDIA_CONTROLLER_ERROR_NONE) { + if (res != MEDIA_CONTROLLER_ERROR_NONE) mc_error("check interity failed"); - mc_db_disconnect(db_handle); - return res; - } /* Disconnect media controller DB*/ - res = mc_db_disconnect(db_handle); - if (res != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Failed to disconnect DB"); + mc_db_disconnect(db_handle); - return MEDIA_CONTROLLER_ERROR_NONE; + return res; } static int _mc_service_reset_db(uid_t uid) @@ -361,11 +356,9 @@ static int _mc_service_reset_db(uid_t uid) mc_error("mc_db_util_init_latest_server_table failed [%d]", res); /* Disconnect media controller DB*/ - res = mc_db_disconnect(db_handle); - if (res != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Failed to disconnect DB"); + mc_db_disconnect(db_handle); - return MEDIA_CONTROLLER_ERROR_NONE; + return res; } static gboolean _mc_service_is_valid_queue(mc_service_t *data) -- 2.7.4