Change storage type enum name (ms_user_storage_type_t -> ms_user_storage_type_e)

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

diff --git a/lib/include/media-util-user.h b/lib/include/media-util-user.h
index 68cd3e5..4d4835e 100755 (executable)
--- a/lib/include/media-util-user.h
+++ b/lib/include/media-util-user.h
@@ -28,10 +28,10 @@ typedef enum {
        MS_USER_STORAGE_INTERNAL = 0,   /**< The device's internal storage */
        MS_USER_STORAGE_EXTERNAL = 1,   /**< The device's external storage */
        MS_USER_STORAGE_EXTERNAL_USB = 2,       /**< The external USB storage (Since 2.4) */
-} ms_user_storage_type_t;
+} ms_user_storage_type_e;
 
 int ms_user_get_internal_root_path(uid_t uid, char **path);
-int ms_user_get_storage_type(uid_t uid, const char *path, ms_user_storage_type_t *storage_type);
+int ms_user_get_storage_type(uid_t uid, const char *path, ms_user_storage_type_e *storage_type);
 int ms_user_get_root_thumb_store_path(uid_t uid, char **path);
 int ms_user_get_default_thumb_store_path(uid_t uid, char **path);
 int ms_user_get_mmc_thumb_store_path(uid_t uid, char **path);

diff --git a/lib/media-util-dcm.c b/lib/media-util-dcm.c
index fb7aaba..1ffaecf 100755 (executable)
--- a/lib/media-util-dcm.c
+++ b/lib/media-util-dcm.c
@@ -406,7 +406,7 @@ int dcm_request_extract_face_async(const unsigned int request_id, const char *pa
        }
        close(exist);
 
-       ms_user_storage_type_t storage_type = -1;
+       ms_user_storage_type_e storage_type = -1;
        storage_type = ms_user_get_storage_type(uid, path, &storage_type);
 
        if ((storage_type != MS_USER_STORAGE_INTERNAL) && (storage_type != MS_USER_STORAGE_EXTERNAL)) {

diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index 2806ad5..d89a9f2 100755 (executable)
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -62,7 +62,7 @@ static int _check_dir_path(const char *dir_path, uid_t uid)
 {
        struct stat sb;
        DIR *dp = NULL;
-       ms_user_storage_type_t storage_type;
+       ms_user_storage_type_e storage_type;
        int ret = MS_MEDIA_ERR_NONE;
 
        ret = ms_user_get_storage_type(uid, dir_path, &storage_type);

diff --git a/lib/media-util-user.c b/lib/media-util-user.c
index 7fb4648..987f62f 100755 (executable)
--- a/lib/media-util-user.c
+++ b/lib/media-util-user.c
@@ -66,7 +66,7 @@ int ms_user_get_internal_root_path(uid_t uid, char **path)
        return ret;
 }
 
-int ms_user_get_storage_type(uid_t uid, const char *path, ms_user_storage_type_t *storage_type)
+int ms_user_get_storage_type(uid_t uid, const char *path, ms_user_storage_type_e *storage_type)
 {
        int ret = MS_MEDIA_ERR_NONE;
        char *internal_path = NULL;

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index 627f0bb..c4254b6 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -531,7 +531,7 @@ int ms_insert_item_batch(void **handle, const char* storage_id, const char *path
        int res = MS_MEDIA_ERR_NONE;
        int ret = MS_MEDIA_ERR_NONE;
        char *err_msg = NULL;
-       ms_user_storage_type_t storage_type = -1;
+       ms_user_storage_type_e storage_type = -1;
 
        MS_DBG_FENTER();
 
@@ -556,7 +556,7 @@ int ms_scan_item_batch(void **handle, const char* storage_id, const char *path,
        int res = MS_MEDIA_ERR_NONE;
        int ret = MS_MEDIA_ERR_NONE;
        char *err_msg = NULL;
-       ms_user_storage_type_t storage_type;
+       ms_user_storage_type_e storage_type;
 
        MS_DBG_FENTER();
 
@@ -642,7 +642,7 @@ int ms_insert_burst_item(void **handle, const char *storage_id, const char *path
        int res = MS_MEDIA_ERR_NONE;
        int ret = MS_MEDIA_ERR_NONE;
        char *err_msg = NULL;
-       ms_user_storage_type_t storage_type;
+       ms_user_storage_type_e storage_type;
 
        ret = ms_user_get_storage_type(uid, path, &storage_type);
        MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "Fail to get storage type");
@@ -962,7 +962,7 @@ int ms_insert_folder(void **handle, const char *storage_id, const char *path, ui
        int res = MS_MEDIA_ERR_NONE;
        int ret = MS_MEDIA_ERR_NONE;
        char *err_msg = NULL;
-       ms_user_storage_type_t storage_type;
+       ms_user_storage_type_e storage_type;
 
        ret = ms_user_get_storage_type(uid, path, &storage_type);
        MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "Fail to get storage type");
@@ -1107,7 +1107,7 @@ int ms_insert_storage(void **handle, const char *storage_id, const char *storage
        int res = MS_MEDIA_ERR_NONE;
        int ret = MS_MEDIA_ERR_NONE;
        char *err_msg = NULL;
-       ms_user_storage_type_t storage_type;
+       ms_user_storage_type_e storage_type;
 
        MS_DBG("ms_insert_storage Start");
 
@@ -1218,7 +1218,7 @@ int ms_update_meta_batch(void **handle, const char *path, const char *storage_id
        int res = MS_MEDIA_ERR_NONE;
        int ret = MS_MEDIA_ERR_NONE;
        char *err_msg = NULL;
-       ms_user_storage_type_t storage_type;
+       ms_user_storage_type_e storage_type;
 
        ret = ms_user_get_storage_type(uid, path, &storage_type);
        MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "Fail to get storage type");

diff --git a/src/common/media-common-utils.c b/src/common/media-common-utils.c
index 6b328d3..db16aef 100755 (executable)
--- a/src/common/media-common-utils.c
+++ b/src/common/media-common-utils.c
@@ -315,7 +315,7 @@ int ms_check_file_path(const char *file_path, uid_t uid)
 {
        int exist;
        struct stat file_st;
-       ms_user_storage_type_t storage_type = -1;
+       ms_user_storage_type_e storage_type = -1;
        int ret = MS_MEDIA_ERR_NONE;
 
        if (!MS_STRING_VALID(file_path)) {

diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c
index 0d98cfb..0570418 100755 (executable)
--- a/src/scanner-v2/media-scanner-extract-v2.c
+++ b/src/scanner-v2/media-scanner-extract-v2.c
@@ -186,7 +186,7 @@ gboolean msc_folder_extract_thread(void *data)
        int ret;
        void **handle = NULL;
        int scan_type;
-       ms_user_storage_type_t storage_type;
+       ms_user_storage_type_e storage_type;
        char *storage_id = NULL;
        char *update_path = NULL;
        unsigned int io_err_count = 0;
@@ -331,7 +331,7 @@ gboolean msc_storage_extract_thread(void *data)
        int ret;
        int err;
        void **handle = NULL;
-       ms_user_storage_type_t storage_type = MS_STORAGE_INTERNAL;
+       ms_user_storage_type_e storage_type = MS_STORAGE_INTERNAL;
        int scan_type;
        //bool valid_status = TRUE;
        char *update_path = NULL;

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 6f1542f..c06069b 100755 (executable)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -1039,7 +1039,7 @@ static int __msc_db_update(void **handle, const char *storage_id, const ms_comm_
        int scan_type;
        int err = MS_MEDIA_ERR_NONE;
        char *start_path = NULL;
-       ms_user_storage_type_t storage_type;
+       ms_user_storage_type_e storage_type;
 
        err = ms_user_get_storage_type(scan_data->uid, scan_data->msg, &storage_type);
        if (err != MS_MEDIA_ERR_NONE)
@@ -1086,7 +1086,7 @@ gboolean msc_directory_scan_thread(void *data)
        char *storage_id = NULL;
        bool modified = FALSE;
        int index = 0;
-       ms_user_storage_type_t storage_type = MS_STORAGE_INTERNAL;
+       ms_user_storage_type_e storage_type = MS_STORAGE_INTERNAL;
        ms_dir_scan_status_e scan_status = MS_DIR_SCAN_NONE;
        ms_noti_type_e noti_type = MS_ITEM_INSERT;
        int before_count = 0;
@@ -1598,7 +1598,7 @@ gboolean msc_storage_scan_thread(void *data)
        int ret;
        int err;
        void **handle = NULL;
-       ms_user_storage_type_t storage_type = MS_USER_STORAGE_INTERNAL;
+       ms_user_storage_type_e storage_type = MS_USER_STORAGE_INTERNAL;
        int scan_type;
        bool valid_status = TRUE;
        char *update_path = NULL;

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 460301a..a78a81c 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -432,7 +432,7 @@ static int __msc_db_update(void **handle, const char *storage_id, const ms_comm_
        int scan_type;
        int err = MS_MEDIA_ERR_NONE;
        char *start_path = NULL;
-       ms_user_storage_type_t storage_type;
+       ms_user_storage_type_e storage_type;
 
        err = ms_user_get_storage_type(scan_data->uid, scan_data->msg, &storage_type);
        MS_DBG_RETVM_IF(err != MS_MEDIA_ERR_NONE, err, "Fail to get storage type");
@@ -476,7 +476,7 @@ gboolean msc_directory_scan_thread(void *data)
        char *storage_id = NULL;
        bool is_recursive = true;
        char *start_path = NULL;
-       ms_user_storage_type_t storage_type;
+       ms_user_storage_type_e storage_type;
        ms_noti_type_e noti_type = MS_ITEM_INSERT;
        int before_count = 0;
        int after_count = 0;
@@ -833,7 +833,7 @@ gboolean msc_storage_scan_thread(void *data)
        int ret;
        int err;
        void **handle = NULL;
-       ms_user_storage_type_t storage_type = MS_USER_STORAGE_INTERNAL;
+       ms_user_storage_type_e storage_type = MS_USER_STORAGE_INTERNAL;
        int scan_type;
        bool valid_status = TRUE;
        char *update_path = NULL;