Unify simple APIs

Change-Id: I8ef091ec82aedb41b9365c4c9a780538fb8dcc2e

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index 4854548..5c1e109 100755 (executable)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -123,20 +123,6 @@ static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, boo
        return MS_MEDIA_ERR_NONE;
 }
 
-static int __media_db_disconnect_db_with_handle(sqlite3 *db_handle)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-
-       ret = db_util_close(db_handle);
-       if (SQLITE_OK != ret) {
-               MSAPI_DBG_ERR("error when db close [%s]", sqlite3_errmsg(db_handle));
-               db_handle = NULL;
-               return MS_MEDIA_ERR_DB_DISCONNECT_FAIL;
-       }
-
-       return MS_MEDIA_ERR_NONE;
-}
-
 extern char MEDIA_IPC_PATH[][70];
 #define MAX_RETRY_COUNT 3
 
@@ -437,13 +423,21 @@ RETRY_CONN:
 
 int media_db_disconnect(MediaDBHandle *handle)
 {
+       int ret = MS_MEDIA_ERR_NONE;
        sqlite3 * db_handle = (sqlite3 *)handle;
 
        MSAPI_DBG_FUNC();
 
        MSAPI_RETVM_IF(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
 
-       return __media_db_disconnect_db_with_handle(db_handle);
+       ret = db_util_close(db_handle);
+       if (SQLITE_OK != ret) {
+               MSAPI_DBG_ERR("error when db close [%s]", sqlite3_errmsg(db_handle));
+               db_handle = NULL;
+               return MS_MEDIA_ERR_DB_DISCONNECT_FAIL;
+       }
+
+       return MS_MEDIA_ERR_NONE;
 }
 
 int media_db_request_update_db(const char *query_str, uid_t uid)