Change DB connection API

Use media-util instead media-svc

Change-Id: I124e7014402e080e4dea416cc56b9a484c46c98d
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/src/common/include/media-common-db-svc.h b/src/common/include/media-common-db-svc.h
index 83a7601..132ec28 100755 (executable)
--- a/src/common/include/media-common-db-svc.h
+++ b/src/common/include/media-common-db-svc.h
@@ -52,8 +52,6 @@ typedef enum {
        MS_ITEM_UPDATE  = 2,
 } ms_noti_type_e;
 
-typedef int (*CONNECT)(void**, uid_t);
-typedef int (*DISCONNECT)(void*);
 typedef int (*CLEANUP_DB)(void*, uid_t);
 typedef int (*INSERT_ITEM_BEGIN)(int, int, int);
 typedef int (*INSERT_ITEM_END)(uid_t);

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index d876583..c0c790e 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -41,8 +41,6 @@ static void **func_handle = NULL; /*dlopen handel*/
 static int scan_other_type = -1;
 
 enum func_list {
-       eCONNECT,
-       eDISCONNECT,
        eCLEANUP_DB,
        eEXIST,
        eINSERT_BEGIN,
@@ -148,8 +146,6 @@ int ms_load_functions(void)
 {
        int lib_index = 0, func_index;
        char func_list[eFUNC_MAX][40] = {
-               "connect_db",
-               "disconnect_db",
                "cleanup_db",
                "check_item_exist",
                "insert_item_begin",
@@ -324,9 +320,7 @@ int ms_connect_db(void ***handle, uid_t uid)
                g_mutex_unlock(&db_mutex);
                return MS_MEDIA_ERR_OUT_OF_MEMORY;
        }
-
-       for (lib_index = 0; lib_index < lib_num; lib_index++)
-               ret = ((CONNECT)func_array[lib_index][eCONNECT])(&((*handle)[lib_index]), uid); /*dlopen*/
+       ret = media_db_connect(&((*handle)[lib_index]), uid, false);
 
        g_mutex_unlock(&db_mutex);
 
@@ -338,10 +332,8 @@ int ms_disconnect_db(void ***handle)
        int lib_index;
        int ret;
 
-       for (lib_index = 0; lib_index < lib_num; lib_index++) {
-               ret = ((DISCONNECT)func_array[lib_index][eDISCONNECT])((*handle)[lib_index]); /*dlopen*/
-               MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "Error : %s", g_array_index(so_array, char*, lib_index));
-       }
+       ret = media_db_disconnect((*handle)[lib_index]);
+       MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "Error : %s", g_array_index(so_array, char*, lib_index));
 
        MS_SAFE_FREE(*handle);
 

diff --git a/src/mediadb-update.c b/src/mediadb-update.c
index 15a78f4..f5fcfea 100755 (executable)
--- a/src/mediadb-update.c
+++ b/src/mediadb-update.c
@@ -55,8 +55,6 @@ typedef struct block_info_s {
        char *mount_uuid;
 } block_info_s;
 
-int (*svc_connect)                             (void ** handle, uid_t uid);
-int (*svc_disconnect)                  (void * handle);
 int (*svc_check_db)                    (void * handle, uid_t uid);
 int (*svc_get_storage_id)              (void * handle, const char *path, char *storage_id, uid_t uid);
 int (*svc_insert_storage)              (void *handle, const char *storage_id, int storage_type, const char *storage_path, uid_t uid);
@@ -213,8 +211,6 @@ static bool __check_storage(void)
                return false;
        }
 
-       svc_connect                     = dlsym(funcHandle, "connect_db");
-       svc_disconnect          = dlsym(funcHandle, "disconnect_db");
        svc_insert_storage      = dlsym(funcHandle, "insert_storage");
        svc_update_storage      = dlsym(funcHandle, "update_storage");
        svc_set_storage_validity        = dlsym(funcHandle, "set_storage_validity");
@@ -223,7 +219,7 @@ static bool __check_storage(void)
        ret = __get_device_list(&dev_list);
        if (ret == 0) {
                /* Set validity to 0 */
-               ret = svc_connect(&db_handle, tzplatform_getuid(TZ_USER_NAME));
+               ret = media_db_connect(&db_handle, tzplatform_getuid(TZ_USER_NAME), false);
                if (ret < 0) {
                        printf("Error svc_connect\n");
                        __release_device_list(&dev_list);
@@ -281,7 +277,7 @@ static bool __check_storage(void)
                        __release_device_list(&dev_list);
                }
 
-               ret = svc_disconnect(db_handle);
+               ret = media_db_disconnect(db_handle);
                if (ret < 0)
                        printf("Error svc_disconnect\n");
        } else {
@@ -307,11 +303,9 @@ static void __check_media_db(void)
                return;
        }
 
-       svc_connect                     = dlsym(funcHandle, "connect_db");
-       svc_disconnect          = dlsym(funcHandle, "disconnect_db");
        svc_check_db                    = dlsym(funcHandle, "check_db");
 
-       ret = svc_connect(&db_handle, tzplatform_getuid(TZ_USER_NAME));
+       ret = media_db_connect(&db_handle, tzplatform_getuid(TZ_USER_NAME), false);
        if (ret < 0)
                printf("Error svc_connect\n");
 
@@ -319,7 +313,7 @@ static void __check_media_db(void)
        if (ret < 0)
                printf("Error svc_check_db\n");
 
-       ret = svc_disconnect(db_handle);
+       ret = media_db_disconnect(db_handle);
        if (ret < 0)
                printf("Error svc_disconnect\n");
 
@@ -345,11 +339,9 @@ static int __get_storage_id(const char *path, char *storage_id, uid_t uid)
                return -1;
        }
 
-       svc_connect                     = dlsym(funcHandle, "connect_db");
-       svc_disconnect          = dlsym(funcHandle, "disconnect_db");
        svc_get_storage_id      = dlsym(funcHandle, "get_storage_id");
 
-       ret = svc_connect(&db_handle, uid);
+       ret = media_db_connect(&db_handle, uid, false);
        if (ret < 0) {
                printf("Error svc_connect\n");
                dlclose(funcHandle);
@@ -362,7 +354,7 @@ static int __get_storage_id(const char *path, char *storage_id, uid_t uid)
                dlclose(funcHandle);
                return -1;
        }
-       ret = svc_disconnect(db_handle);
+       ret = media_db_disconnect(db_handle);
        if (ret < 0) {
                printf("Error svc_disconnect\n");
                dlclose(funcHandle);

diff --git a/src/server/media-server-device-block.c b/src/server/media-server-device-block.c
index f1cd37c..c911cb1 100755 (executable)
--- a/src/server/media-server-device-block.c
+++ b/src/server/media-server-device-block.c
@@ -31,7 +31,7 @@
 #include "media-server-device-block.h"
 
 #ifndef _USE_DEVICED_DBUS
-static int __ms_get_added_storage_path(void **handle, const char *add_path, char **device_id)
+static int __ms_get_added_storage_path(const char *add_path, char **device_id)
 {
        int ret = MS_MEDIA_ERR_NONE;
        char *id = NULL;