From dcd34cfea816c2ed43e555a9dc22fed9a3222d3f Mon Sep 17 00:00:00 2001 From: hj kim Date: Fri, 30 Nov 2018 11:30:23 +0900 Subject: [PATCH] Check input parmeters Change-Id: I849997c6e108bcab03c6ea0bc93afe71bef098ea --- src/common/media-svc-db-utils.c | 11 ++-- src/common/media-svc-media-folder.c | 9 +++- src/common/media-svc-media.c | 14 +++++ src/common/media-svc-storage.c | 11 ++++ src/common/media-svc-util.c | 27 +++++++--- src/common/media-svc.c | 105 ++++-------------------------------- src/include/common/media-svc-util.h | 1 + 7 files changed, 71 insertions(+), 107 deletions(-) diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c index 15c4c89..51cb88b 100755 --- a/src/common/media-svc-db-utils.c +++ b/src/common/media-svc-db-utils.c @@ -1388,15 +1388,16 @@ int _media_svc_sql_prepare_to_step(sqlite3 *handle, const char *sql_str, sqlite3 { int err = -1; - media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "handle is NULL"); - - media_svc_sec_debug("[SQL query] : %s", sql_str); + media_svc_retvm_if(sql_str == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "invalid query"); - if (!STRING_VALID(sql_str)) { - media_svc_error("invalid query"); + if (handle == NULL) { + media_svc_error("handle is NULL"); + sqlite3_free((char *)sql_str); return MS_MEDIA_ERR_INVALID_PARAMETER; } + media_svc_sec_debug("[SQL query] : %s", sql_str); + err = sqlite3_prepare_v2(handle, sql_str, -1, stmt, NULL); sqlite3_free((char *)sql_str); diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c index 600f79b..98491de 100755 --- a/src/common/media-svc-media-folder.c +++ b/src/common/media-svc-media-folder.c @@ -373,8 +373,12 @@ int _media_svc_count_folder_with_path(sqlite3 *handle, const char *storage_id, c { int ret = MS_MEDIA_ERR_NONE; sqlite3_stmt *sql_stmt = NULL; + char *sql = 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"); - char *sql = sqlite3_mprintf("SELECT count(*) FROM %q WHERE (storage_uuid='%q' AND path='%q')", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path); + sql = sqlite3_mprintf("SELECT count(*) FROM %q WHERE (storage_uuid='%q' AND path='%q')", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); @@ -393,6 +397,9 @@ int _media_svc_get_folder_uuid(sqlite3 *handle, const char *storage_id, const ch sqlite3_stmt *sql_stmt = NULL; char *sql = NULL; + media_svc_retvm_if(storage_id == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL"); + media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL"); + sql = sqlite3_mprintf("SELECT folder_uuid FROM %q WHERE (storage_uuid='%q' AND path='%q')", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c index 4db889b..5af6f9d 100755 --- a/src/common/media-svc-media.c +++ b/src/common/media-svc-media.c @@ -449,6 +449,9 @@ int _media_svc_delete_invalid_items(sqlite3 *handle, const char *storage_id, ms_ int ret = MS_MEDIA_ERR_NONE; GArray *thumb_list = 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_type(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); + thumb_list = g_array_new(FALSE, FALSE, sizeof(char*)); /*If external USB, no need this process */ @@ -535,6 +538,9 @@ int _media_svc_update_storage_item_validity(const char *storage_id, ms_user_stor { int ret = MS_MEDIA_ERR_NONE; + 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_type(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); + char *sql = sqlite3_mprintf("UPDATE '%q' SET validity=%d WHERE storage_type=%d;", storage_id, validity, storage_type); ret = _media_svc_sql_query(sql, uid); @@ -550,6 +556,9 @@ int _media_svc_update_folder_item_validity(sqlite3 *handle, const char *storage_ char folder_uuid[MEDIA_SVC_UUID_SIZE + 1] = {0, }; sqlite3_stmt *sql_stmt = NULL; + media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL"); + media_svc_retvm_if(!STRING_VALID(folder_path), MS_MEDIA_ERR_INVALID_PARAMETER, "folder_path is NULL"); + /*Get folder ID*/ sql = sqlite3_mprintf("SELECT folder_uuid FROM '%q' WHERE path='%q' AND storage_uuid='%q'", MEDIA_SVC_DB_TABLE_FOLDER, folder_path, storage_id); @@ -579,6 +588,9 @@ int _media_svc_update_recursive_folder_item_validity(const char *storage_id, con { int ret = MS_MEDIA_ERR_NONE; + media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL"); + media_svc_retvm_if(!STRING_VALID(folder_path), MS_MEDIA_ERR_INVALID_PARAMETER, "folder_path is NULL"); + /*Update folder item validity*/ char *sql = sqlite3_mprintf("UPDATE '%q' SET validity=%d WHERE (storage_type = 0 OR storage_type = 1) AND path LIKE '%q/%%';", storage_id, validity, folder_path); @@ -657,6 +669,8 @@ int _media_svc_append_query_list(const char *query, uid_t uid) { int ret = MS_MEDIA_ERR_NONE; + media_svc_retvm_if(query == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "query is NULL"); + g_media_svc_update_list = g_list_append(g_media_svc_update_list, (gpointer)query); if (g_list_length(g_media_svc_update_list) >= MEDIA_SVC_MAX_COMMIT_SIZE) diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c index 13326fe..1483584 100755 --- a/src/common/media-svc-storage.c +++ b/src/common/media-svc-storage.c @@ -32,6 +32,10 @@ int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **sto sqlite3_stmt *sql_stmt = NULL; char *sql = 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(validity == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "validity is NULL"); + *storage_path = NULL; *validity = 0; @@ -88,6 +92,9 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons char *old_storage_path = NULL; int validity = 0; + media_svc_retvm_if(storage_id == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL"); + media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL"); + /*Get old path*/ ret = _media_svc_check_storage(handle, storage_id, &old_storage_path, &validity, uid); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); @@ -239,6 +246,8 @@ int _media_svc_get_storage_uuid(sqlite3 *handle, const char *path, char *storage int remain_len = 0; char *internal_path = NULL; + media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL"); + ret = ms_user_get_internal_root_path(uid, &internal_path); media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "Fail to get root path"); @@ -302,6 +311,8 @@ int _media_svc_get_all_storage(sqlite3 *handle, char ***storage_list, char ***st char *sql = NULL; int cnt = 0; + media_svc_retvm_if(count == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "count is NULL"); + ret = __media_svc_count_all_storage(handle, &cnt); if (ret != MS_MEDIA_ERR_NONE) { media_svc_error("error when __media_svc_count_all_folders. err = [%d]", ret); diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c index e86f80d..ffdf6e1 100755 --- a/src/common/media-svc-util.c +++ b/src/common/media-svc-util.c @@ -450,8 +450,7 @@ If the file is not OMA DRM, drm_contentinfo must be NULL. */ static int __media_svc_get_mime_type(const char *path, char *mimetype) { - if (path == NULL) - return MS_MEDIA_ERR_INVALID_PARAMETER; + media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL"); /*in case of normal files or failure to get mime in drm */ if (aul_get_mime_from_file(path, mimetype, 255) < 0) { @@ -823,6 +822,9 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char bool drm_type = false; char mime_type[256] = {0, }; + media_svc_retvm_if(_media_svc_check_storage_type(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); + media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL"); + content_info->path = g_strdup(path); media_svc_retv_del_if(content_info->path == NULL, MS_MEDIA_ERR_INTERNAL, content_info); @@ -1942,12 +1944,10 @@ int _media_svc_get_pinyin_str(const char *src_str, char **pinyin_str) int size = 0; pinyin_name_s *pinyinname = NULL; - *pinyin_str = NULL; + media_svc_retvm_if(!STRING_VALID(src_str), MS_MEDIA_ERR_INVALID_PARAMETER, "String is NULL"); + media_svc_retvm_if(pinyin_str == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "pinyin_str is NULL"); - if (!STRING_VALID(src_str)) { - media_svc_debug("String is invalid"); - return ret; - } + *pinyin_str = NULL; ret = _media_svc_convert_chinese_to_pinyin(src_str, &pinyinname, &size); if (ret == MS_MEDIA_ERR_NONE) { @@ -1986,6 +1986,8 @@ int _media_svc_get_media_type(const char *path, int *mediatype) char mime_type[256] = {0}; media_svc_media_type_e media_type = MEDIA_SVC_MEDIA_TYPE_OTHER; + media_svc_retvm_if(mediatype == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "mediatype is NULL"); + ret = __media_svc_get_mime_type(path, mime_type); if (ret == MS_MEDIA_ERR_NONE) __media_svc_get_media_type(path, mime_type, &media_type); @@ -1997,3 +1999,14 @@ int _media_svc_get_media_type(const char *path, int *mediatype) return ret; } +bool _media_svc_check_storage_type(ms_user_storage_type_e storage_type) +{ + if ((storage_type != MS_USER_STORAGE_INTERNAL) + && (storage_type != MS_USER_STORAGE_EXTERNAL) + && (storage_type != MS_USER_STORAGE_EXTERNAL_USB)) { + media_svc_error("storage type is incorrect[%d]", storage_type); + return FALSE; + } + + return TRUE; +} diff --git a/src/common/media-svc.c b/src/common/media-svc.c index 131c788..77d5c93 100755 --- a/src/common/media-svc.c +++ b/src/common/media-svc.c @@ -49,18 +49,6 @@ static __thread int g_insert_with_noti = FALSE; #define BATCH_REQUEST_MAX 300 -static bool __media_svc_check_storage(ms_user_storage_type_e storage_type) -{ - if ((storage_type != MS_USER_STORAGE_INTERNAL) - && (storage_type != MS_USER_STORAGE_EXTERNAL) - && (storage_type != MS_USER_STORAGE_EXTERNAL_USB)) { - media_svc_error("storage type is incorrect[%d]", storage_type); - return FALSE; - } - - return TRUE; -} - int media_svc_cleanup_db(sqlite3 *handle, uid_t uid) { media_svc_debug_fenter(); @@ -261,7 +249,7 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, ms_user_ media_svc_retvm_if(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) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); + media_svc_retvm_if(_media_svc_check_storage_type(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)); @@ -350,7 +338,7 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, m media_svc_retvm_if(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) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); + media_svc_retvm_if(_media_svc_check_storage_type(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)); @@ -610,28 +598,17 @@ int media_svc_delete_invalid_items_in_storage(sqlite3 *handle, const char *stora { media_svc_debug_fenter(); - media_svc_retvm_if(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) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); - /*Delete from DB and remove thumbnail files*/ return _media_svc_delete_invalid_items(handle, storage_id, storage_type, uid); } int media_svc_set_all_storage_items_validity(const char *storage_id, ms_user_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) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); - return _media_svc_update_storage_item_validity(storage_id, storage_type, validity, uid); } int media_svc_set_folder_items_validity(sqlite3 *handle, const char *storage_id, const char *folder_path, int validity, int recursive, uid_t uid) { - media_svc_retvm_if(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(folder_path), MS_MEDIA_ERR_INVALID_PARAMETER, "folder_path is NULL"); - if (recursive) return _media_svc_update_recursive_folder_item_validity(storage_id, folder_path, validity, uid); else @@ -647,7 +624,7 @@ int media_svc_refresh_item(sqlite3 *handle, const char *storage_id, ms_user_stor media_svc_retvm_if(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) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); + media_svc_retvm_if(_media_svc_check_storage_type(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)); @@ -772,8 +749,6 @@ int media_svc_check_db_upgrade(sqlite3 *handle, int user_version, uid_t uid) { media_svc_debug_fenter(); - media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL"); - return _media_svc_check_db_upgrade(handle, user_version, uid); } @@ -808,10 +783,6 @@ int media_svc_update_item_meta(const char *file_path, const char *storage_id, in { int ret = MS_MEDIA_ERR_NONE; 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) != 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)); @@ -872,8 +843,6 @@ int media_svc_publish_noti(media_item_type_e update_item, media_item_update_type int media_svc_get_pinyin(const char *src_str, char **pinyin_str) { - media_svc_retvm_if(!STRING_VALID(src_str), MS_MEDIA_ERR_INVALID_PARAMETER, "String is NULL"); - return _media_svc_get_pinyin_str(src_str, pinyin_str); } @@ -901,23 +870,13 @@ int media_svc_set_storage_validity(sqlite3 *handle, const char *storage_id, int int media_svc_get_storage_id(sqlite3 *handle, const char *path, char *storage_id, uid_t uid) { - int ret = MS_MEDIA_ERR_NONE; - - media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL"); - media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL"); - - ret = _media_svc_get_storage_uuid(handle, path, storage_id, uid); - - return ret; + return _media_svc_get_storage_uuid(handle, path, storage_id, uid); } int media_svc_get_storage_list(sqlite3 *handle, char ***storage_list, char ***storage_id_list, int *count) { media_svc_debug_fenter(); - media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL"); - media_svc_retvm_if(count == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "count is NULL"); - return _media_svc_get_all_storage(handle, storage_list, storage_id_list, count); } @@ -934,20 +893,11 @@ int media_svc_generate_uuid(char **uuid) int media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **storage_path, int *validity, uid_t uid) { - media_svc_retvm_if(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(validity == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "validity is NULL"); - return _media_svc_check_storage(handle, storage_id, storage_path, validity, uid); } int media_svc_update_storage(sqlite3 *handle, const char *storage_id, const char *storage_path, uid_t uid) { - media_svc_retvm_if(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"); - return _media_svc_update_storage_path(handle, storage_id, storage_path, uid); } @@ -958,7 +908,7 @@ int media_svc_insert_storage(sqlite3 *handle, const char *storage_id, const char media_svc_retvm_if(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, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); + media_svc_retvm_if(_media_svc_check_storage_type(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); ret = _media_svc_append_storage(storage_id, storage_path, storage_type, uid); media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "append storage failed : %d", ret); @@ -1011,7 +961,7 @@ int media_svc_insert_folder(sqlite3 *handle, const char *storage_id, ms_user_sto media_svc_retvm_if(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) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); + media_svc_retvm_if(_media_svc_check_storage_type(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); if (g_media_svc_insert_folder_data_cnt == 1) { @@ -1044,22 +994,12 @@ int media_svc_insert_folder(sqlite3 *handle, const char *storage_id, ms_user_sto int media_svc_delete_invalid_folder(const char *storage_id, int storage_type, uid_t uid) { - int ret = MS_MEDIA_ERR_NONE; - - ret = _media_svc_delete_invalid_folder(storage_id, storage_type, uid); - - return ret; + return _media_svc_delete_invalid_folder(storage_id, storage_type, uid); } int media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid) { - int ret = MS_MEDIA_ERR_NONE; - - media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL"); - - ret = _media_svc_set_folder_validity(handle, storage_id, start_path, validity, is_recursive, uid); - - return ret; + return _media_svc_set_folder_validity(handle, storage_id, start_path, validity, is_recursive, uid); } int media_svc_check_folder_exist_by_path(sqlite3 *handle, const char *storage_id, const char *folder_path) @@ -1067,10 +1007,6 @@ int media_svc_check_folder_exist_by_path(sqlite3 *handle, const char *storage_id int ret = MS_MEDIA_ERR_NONE; int count = -1; - media_svc_retvm_if(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(folder_path), MS_MEDIA_ERR_INVALID_PARAMETER, "Path is NULL"); - ret = _media_svc_count_folder_with_path(handle, storage_id, folder_path, &count); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); @@ -1087,40 +1023,21 @@ int media_svc_check_folder_exist_by_path(sqlite3 *handle, const char *storage_id int media_svc_get_folder_id(sqlite3 *handle, const char *storage_id, const char *path, char *folder_id) { - int ret = MS_MEDIA_ERR_NONE; - - media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL"); - media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL"); - - ret = _media_svc_get_folder_uuid(handle, storage_id, path, folder_id); - - return ret; + return _media_svc_get_folder_uuid(handle, storage_id, path, folder_id); } int media_svc_append_query(const char *query, uid_t uid) { - int ret = MS_MEDIA_ERR_NONE; - - media_svc_retvm_if(query == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "query is NULL"); - - ret = _media_svc_append_query_list(query, uid); - - return ret; + return _media_svc_append_query_list(query, uid); } int media_svc_send_query(uid_t uid) { - int ret = MS_MEDIA_ERR_NONE; - - ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_UPDATE_COMMON, uid); - - return ret; + return _media_svc_list_query_do(MEDIA_SVC_QUERY_UPDATE_COMMON, uid); } int media_svc_get_media_type(const char *path, int *mediatype) { - media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL"); - return _media_svc_get_media_type(path, mediatype); } diff --git a/src/include/common/media-svc-util.h b/src/include/common/media-svc-util.h index 9398292..adeb309 100755 --- a/src/include/common/media-svc-util.h +++ b/src/include/common/media-svc-util.h @@ -65,6 +65,7 @@ int _media_svc_get_pinyin_str(const char *src_str, char **pinyin_str); bool _media_svc_check_pinyin_support(void); int _media_svc_extract_music_metadata_for_update(media_svc_content_info_s *content_info, media_svc_media_type_e media_type); int _media_svc_get_media_type(const char *path, int *mediatype); +bool _media_svc_check_storage_type(ms_user_storage_type_e storage_type); #ifdef __cplusplus } -- 2.7.4