Remove unnecessary parameter

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

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 518c1c9..b65048e 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -51,29 +51,19 @@ static __thread int g_media_svc_insert_folder_cur_data_cnt = 0;
 /* Flag for items to be published by notification */
 static __thread int g_insert_with_noti = FALSE;
 
-#define DEFAULT_MEDIA_SVC_STORAGE_ID "media"
 #define BATCH_REQUEST_MAX 300
 typedef struct {
        int media_type;
        char *path;
 } media_svc_item_info_s;
 
-static bool __media_svc_check_storage(media_svc_storage_type_e storage_type, bool check_all)
+static bool __media_svc_check_storage(media_svc_storage_type_e storage_type)
 {
-       if (check_all == TRUE) {
-               if ((storage_type != MEDIA_SVC_STORAGE_INTERNAL)
-                       && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL)
-                       && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL_USB)) {
-                       media_svc_error("storage type is incorrect[%d]", storage_type);
-                       return FALSE;
-               }
-       } else {
-               if ((storage_type != MEDIA_SVC_STORAGE_INTERNAL)
-                       && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL)
-                       && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL_USB)) {
-                       media_svc_error("storage type is incorrect[%d]", storage_type);
-                       return FALSE;
-               }
+       if ((storage_type != MEDIA_SVC_STORAGE_INTERNAL)
+               && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL)
+               && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL_USB)) {
+               media_svc_error("storage type is incorrect[%d]", storage_type);
+               return FALSE;
        }
 
        return TRUE;
@@ -352,7 +342,7 @@ int media_svc_insert_item_bulk(MediaSvcHandle *handle, const char *storage_id, m
        media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
-       media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+       media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
        media_svc_content_info_s content_info;
        memset(&content_info, 0, sizeof(media_svc_content_info_s));
@@ -442,7 +432,7 @@ int media_svc_insert_item_immediately(MediaSvcHandle *handle, const char *storag
        media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
-       media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+       media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
        media_svc_content_info_s content_info;
        memset(&content_info, 0, sizeof(media_svc_content_info_s));
@@ -522,8 +512,8 @@ int media_svc_move_item(MediaSvcHandle *handle, const char *storage_id, media_sv
        media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
        media_svc_retvm_if(!STRING_VALID(src_path), MS_MEDIA_ERR_INVALID_PARAMETER, "src_path is NULL");
        media_svc_retvm_if(!STRING_VALID(dest_path), MS_MEDIA_ERR_INVALID_PARAMETER, "dest_path is NULL");
-       media_svc_retvm_if(__media_svc_check_storage(src_storage, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid src_storage");
-       media_svc_retvm_if(__media_svc_check_storage(dest_storage, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid dest_storage");
+       media_svc_retvm_if(__media_svc_check_storage(src_storage) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid src_storage");
+       media_svc_retvm_if(__media_svc_check_storage(dest_storage) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid dest_storage");
 
        /*check and update folder*/
        ret = _media_svc_get_and_append_folder_id_by_path(db_handle, storage_id, dest_path, dest_storage, folder_uuid, uid);
@@ -792,7 +782,7 @@ int media_svc_delete_all_items_in_storage(const char *storage_id, media_svc_stor
        media_svc_debug("media_svc_delete_all_items_in_storage [%d]", storage_type);
 
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
-       media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+       media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
        ret = _media_svc_truncate_table(storage_id, storage_type, uid);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
@@ -831,7 +821,7 @@ int media_svc_delete_invalid_items_in_storage(MediaSvcHandle *handle, const char
 
        media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
-       media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+       media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
        /*Delete from DB and remove thumbnail files*/
        return _media_svc_delete_invalid_items(db_handle, storage_id, storage_type, uid);
@@ -853,7 +843,7 @@ int media_svc_delete_invalid_items_in_folder(MediaSvcHandle *handle, const char
 int media_svc_set_all_storage_items_validity(const char *storage_id, media_svc_storage_type_e storage_type, int validity, uid_t uid)
 {
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
-       media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+       media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
        return _media_svc_update_storage_item_validity(storage_id, storage_type, validity, uid);
 }
@@ -881,7 +871,7 @@ int media_svc_refresh_item(MediaSvcHandle *handle, const char *storage_id, media
        media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
-       media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+       media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
        media_svc_content_info_s content_info;
        memset(&content_info, 0, sizeof(media_svc_content_info_s));
@@ -1287,7 +1277,7 @@ int media_svc_update_item_meta(MediaSvcHandle *handle, const char *file_path, co
 
        media_svc_media_type_e media_type;
        media_svc_retvm_if(!STRING_VALID(file_path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
-       media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+       media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
        media_svc_content_info_s content_info;
        memset(&content_info, 0, sizeof(media_svc_content_info_s));
@@ -1765,7 +1755,7 @@ int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, con
        media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
        media_svc_retvm_if(storage_id == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(storage_path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_path is NULL");
-       media_svc_retvm_if(__media_svc_check_storage(storage_type, TRUE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+       media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
        ret = _media_svc_append_storage(storage_id, storage_name, storage_path, storage_type, uid);
        media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "append storage failed : %d", ret);
@@ -1847,7 +1837,7 @@ int media_svc_insert_folder(MediaSvcHandle *handle, const char *storage_id, medi
        media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
-       media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+       media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
        if (g_media_svc_insert_folder_data_cnt == 1) {
 
@@ -1909,7 +1899,7 @@ int media_svc_insert_item_pass1(MediaSvcHandle *handle, const char *storage_id,
        media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
-       media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+       media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
        media_svc_content_info_s content_info;
        memset(&content_info, 0, sizeof(media_svc_content_info_s));