From 12664e821921d4991c02960adc0914fc6ed4a7d2 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Mon, 5 Aug 2019 11:47:52 +0900 Subject: [PATCH] Change return type of media_db_disconnect() sqlite3_close_v2() always returns SQLITE_OK. Therefore, it does not need to check the return value. Change-Id: Ida11b4577d9553d377df02b83a5c07088ee3da40 Signed-off-by: Minje Ahn --- lib/include/media-util-db.h | 2 +- lib/media-util-db.c | 16 +++------------- src/mediadb-update.c | 11 ++--------- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/lib/include/media-util-db.h b/lib/include/media-util-db.h index 437b0a7..00727f6 100755 --- a/lib/include/media-util-db.h +++ b/lib/include/media-util-db.h @@ -32,7 +32,7 @@ extern "C" { int media_db_connect(sqlite3 **handle, uid_t uid, bool need_write); -int media_db_disconnect(sqlite3 *handle); +void media_db_disconnect(sqlite3 *handle); int media_db_request_update_db(const char *query_str, uid_t uid); diff --git a/lib/media-util-db.c b/lib/media-util-db.c index e5fbf08..a3b877c 100755 --- a/lib/media-util-db.c +++ b/lib/media-util-db.c @@ -535,22 +535,12 @@ RETRY_CONN: return MS_MEDIA_ERR_NONE; } -int media_db_disconnect(sqlite3 *handle) +void media_db_disconnect(sqlite3 *handle) { - int ret = MS_MEDIA_ERR_NONE; - MSAPI_DBG_FUNC(); - MSAPI_RETVM_IF(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL"); - - ret = sqlite3_close_v2(handle); - if (SQLITE_OK != ret) { - MSAPI_DBG_ERR("error when db close [%s]", sqlite3_errmsg(handle)); - handle = NULL; - return MS_MEDIA_ERR_DB_DISCONNECT_FAIL; - } - - return MS_MEDIA_ERR_NONE; + if (handle) + sqlite3_close_v2(handle); } int media_db_request_update_db(const char *query_str, uid_t uid) diff --git a/src/mediadb-update.c b/src/mediadb-update.c index bc89b35..5ae346b 100755 --- a/src/mediadb-update.c +++ b/src/mediadb-update.c @@ -82,9 +82,7 @@ static void __check_media_db(void) if (ret < 0) printf("Error svc_check_db\n"); - ret = media_db_disconnect(db_handle); - if (ret < 0) - printf("Error svc_disconnect\n"); + media_db_disconnect(db_handle); printf("Check media db done\n"); @@ -123,12 +121,7 @@ static int __get_storage_id(const char *path, char *storage_id, uid_t uid) dlclose(funcHandle); return -1; } - ret = media_db_disconnect(db_handle); - if (ret < 0) { - printf("Error svc_disconnect\n"); - dlclose(funcHandle); - return -1; - } + media_db_disconnect(db_handle); printf("Start Scanning for [%s][%s]\n", path, storage_id); dlclose(funcHandle); -- 2.7.4