Rename check_db_upgrade to check_db

media.db no longer provides version information.

Change-Id: Ifc649f2885b23eb467c731e35aa35bb7ca5895df
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 5ab7942..5f95471 100755 (executable)
--- a/src/common/include/media-common-db-svc.h
+++ b/src/common/include/media-common-db-svc.h
@@ -50,7 +50,7 @@ int ms_get_storage_id(sqlite3 *handle, const char *path, char *storage_id, uid_t
 int ms_insert_folder(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
 int ms_delete_invalid_folder(const char *storage_id, uid_t uid);
 int ms_set_folder_validity(sqlite3 *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid);
-int ms_check_db_upgrade(sqlite3 *handle, uid_t uid);
+int ms_check_db(sqlite3 *handle, uid_t uid);
 int ms_check_storage(sqlite3 *handle, const char *storage_id, char **storage_path, int *validity, uid_t uid);
 int ms_insert_storage(sqlite3 *handle, const char *storage_id, const char *storage_path, uid_t uid);
 int ms_update_storage(sqlite3 *handle, const char *storage_id, const char *storage_path, uid_t uid);

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index 748e219..347a9f8 100644 (file)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -556,7 +556,7 @@ int ms_set_folder_validity(sqlite3 *handle, const char *storage_id, const char *
        return ret;
 }
 
-int ms_check_db_upgrade(sqlite3 *handle, uid_t uid)
+int ms_check_db(sqlite3 *handle, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
 

diff --git a/src/server/media-server-db-manage.c b/src/server/media-server-db-manage.c
index ad7e28d..1d7598f 100755 (executable)
--- a/src/server/media-server-db-manage.c
+++ b/src/server/media-server-db-manage.c
@@ -86,8 +86,8 @@ static int __ms_remake_mediadb(uid_t uid)
        ms_connect_db(&handle, uid);
 
        MS_DBG_WARN("START WRITE SCHEMA");
-       if (ms_check_db_upgrade(handle, uid) != MS_MEDIA_ERR_NONE)
-               MS_DBG_ERR("ms_check_db_upgrade fail");
+       if (ms_check_db(handle, uid) != MS_MEDIA_ERR_NONE)
+               MS_DBG_ERR("ms_check_db fail");
 
        MS_DBG_WARN("END WRITE SCHEMA");
 

diff --git a/src/server/media-server-device-block.c b/src/server/media-server-device-block.c
index 91a289d..9f122ca 100644 (file)
--- a/src/server/media-server-device-block.c
+++ b/src/server/media-server-device-block.c
@@ -51,9 +51,9 @@ int ms_storage_insert_handler(const char *mount_path, const char *mount_uuid)
        if (mount_path != NULL && mount_uuid != NULL) {
                /*CHECK DB HERE */
                uuid = g_strndup(mount_uuid, strlen(mount_uuid));
-               ret = ms_check_db_upgrade(handle, uid);
+               ret = ms_check_db(handle, uid);
                if (ret != MS_MEDIA_ERR_NONE) {
-                       MS_DBG_ERR("ms_check_db_upgrade failed");
+                       MS_DBG_ERR("ms_check_db failed");
                        goto ERROR;
                }
 
@@ -425,4 +425,3 @@ int ms_check_mounted_storage(uid_t uid)
        return ret;
 }
 #endif
-

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index 87dfd6e..9dbe7fa 100644 (file)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -488,9 +488,9 @@ static void __ms_check_mediadb(void)
                return;
        }
 
-       ret = ms_check_db_upgrade(db_handle, uid);
+       ret = ms_check_db(db_handle, uid);
        if (ret != MS_MEDIA_ERR_NONE) {
-               MS_DBG_ERR("ms_check_db_upgrade failed [%d]", ret);
+               MS_DBG_ERR("ms_check_db failed [%d]", ret);
                ms_disconnect_db(db_handle);
                return;
        }

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index ecf6f4d..0756d8c 100644 (file)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -178,8 +178,8 @@ static void __ms_recovery_media_db(uid_t uid)
        ms_connect_db(&handle, uid);
 
        MS_DBG_WARN("START WRITE SCHEMA");
-       if (ms_check_db_upgrade(handle, uid) != MS_MEDIA_ERR_NONE)
-               MS_DBG_ERR("ms_check_db_upgrade fail");
+       if (ms_check_db(handle, uid) != MS_MEDIA_ERR_NONE)
+               MS_DBG_ERR("ms_check_db fail");
 
        MS_DBG_WARN("END WRITE SCHEMA");
 
@@ -498,4 +498,3 @@ int ms_send_storage_otg_scan_request(const char *path, const char *device_uuid,
 
        return ms_send_scan_request(&scan_msg, -1);
 }
-