From: hj kim Date: Mon, 30 Mar 2020 05:07:32 +0000 (+0900) Subject: Remove duplicated memory setting X-Git-Tag: accepted/tizen/unified/20200402.155614~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F229145%2F3;p=platform%2Fcore%2Fapi%2Fmedia-content.git Remove duplicated memory setting Change-Id: I9bad88886bae7a4ce86b4e1a0edb664814d9343e --- diff --git a/src/media_content.c b/src/media_content.c index 1640353..40cc5bf 100644 --- a/src/media_content.c +++ b/src/media_content.c @@ -89,7 +89,6 @@ int _content_query_prepare_by_union_select(sqlite3_stmt **stmt, char *select_que int len = 0; int err = MEDIA_CONTENT_ERROR_NONE; char query[MAX_QUERY_SIZE] = {0, }; - memset(query, '\0', sizeof(query)); content_retvm_if(_content_get_db_handle() == NULL, MEDIA_CONTENT_ERROR_DB_FAILED, "database is not connected"); content_retvm_if(!STRING_VALID(select_query1), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid select_query1"); @@ -258,13 +257,11 @@ int media_content_scan_file(const char *path) content_sec_debug("Path : %s", path); - memset(repl_path, 0, sizeof(repl_path)); ret = _media_content_replace_path(path, repl_path); content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); content_retvm_if(_media_util_is_ignorable_file(repl_path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path"); - memset(storage_id, 0x00, sizeof(storage_id)); ret = media_svc_get_storage_id(_content_get_db_handle(), repl_path, storage_id, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { content_error("media_svc_get_storage_id failed : %d", ret); @@ -410,12 +407,10 @@ int media_content_scan_folder(const char *path, bool is_recursive, media_scan_co ms_user_storage_type_e storage_type = MS_USER_STORAGE_INTERNAL; content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path"); - memset(repl_path, 0, sizeof(repl_path)); + ret = _media_content_replace_path(path, repl_path); content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); - memset(storage_id, 0x00, sizeof(storage_id)); - ret = _media_content_check_dir(repl_path); content_retvm_if(ret == MEDIA_CONTENT_ERROR_PERMISSION_DENIED, ret, "Permission Denied"); @@ -463,8 +458,6 @@ int media_content_scan_folder_v2(const char *path, bool is_recursive, media_scan char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, }; content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path"); - memset(storage_id, 0x00, sizeof(storage_id)); - content_retvm_if(_media_util_is_ignorable_dir(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid folder path"); ret = _media_content_check_dir(path); @@ -496,7 +489,6 @@ int media_content_cancel_scan_folder(const char *path) content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path"); - memset(repl_path, 0, sizeof(repl_path)); ret = _media_content_replace_path(path, repl_path); content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); diff --git a/src/media_db.c b/src/media_db.c index 08b8ab5..4ae0863 100755 --- a/src/media_db.c +++ b/src/media_db.c @@ -285,7 +285,6 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g char *tmp_option = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); if (group < MEDIA_PVR_GROUP_DURATION) { /*media content*/ if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group), _filter->storage_id); @@ -335,7 +334,7 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_ char *name = NULL; sqlite3_stmt *stmt = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); + if (group < MEDIA_PVR_GROUP_DURATION) { /*media content */ if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group), _filter->storage_id); @@ -387,9 +386,6 @@ int _media_db_get_media_group_and_count(media_group_e group, filter_h filter, me sqlite3_stmt *stmt = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); - memset(group_query, 0x00, sizeof(group_query)); - const char* group_name = __media_db_get_group_name(group); if (!STRING_VALID(group_name)) { ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; @@ -606,7 +602,6 @@ int _media_db_get_album(filter_h filter, media_album_cb callback, void *user_dat sqlite3_stmt *stmt = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); #ifdef _USE_TVPD_MODE if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_ALBUM_LIST, _filter->storage_id); @@ -662,7 +657,6 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d sqlite3_stmt *stmt = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); #ifdef _USE_TVPD_MODE if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_FOLDER_LIST_BY_STORAGE_ID, _filter->storage_id, _filter->storage_id); @@ -857,7 +851,6 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark sqlite3_stmt *stmt = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); #ifdef _USE_TVPD_MODE if (STRING_VALID(media_id)) { //get bookmark by media_id if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) @@ -927,7 +920,6 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call sqlite3_stmt *stmt = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); #ifdef _USE_TVPD_MODE if (STRING_VALID(media_id)) { //get face by media_id if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) @@ -999,8 +991,6 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li char *option_query = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); - switch (group_type) { case MEDIA_GROUP_ALBUM: #ifdef _USE_TVPD_MODE @@ -1056,8 +1046,6 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou bool need_bracket = false; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); - switch (group_type) { case MEDIA_GROUP_NONE: if (!_filter) { @@ -1197,8 +1185,6 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb sqlite3_stmt *stmt = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); - switch (group_type) { case MEDIA_GROUP_ALBUM: #ifdef _USE_TVPD_MODE @@ -1287,8 +1273,6 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info sqlite3_stmt *stmt = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); - switch (group_type) { case MEDIA_GROUP_NONE: #ifdef _USE_TVPD_MODE @@ -1373,8 +1357,6 @@ int _media_db_get_group_item_by_union_select(const char *group_name, filter_h fi filter_s *_filter1 = (filter_s *)filter1; filter_s *_filter2 = (filter_s *)filter2; - memset(select_query1, 0x00, sizeof(select_query1)); - if ((_filter1 != NULL) && STRING_VALID(_filter1->storage_id)) snprintf(select_query1, sizeof(select_query1), SELECT_MEDIA_FROM_FOLDER, _filter1->storage_id, group_name); else @@ -1388,8 +1370,6 @@ int _media_db_get_group_item_by_union_select(const char *group_name, filter_h fi return ret; } - memset(select_query2, 0x00, sizeof(select_query2)); - if ((_filter2 != NULL) && STRING_VALID(_filter2->storage_id)) snprintf(select_query2, sizeof(select_query2), SELECT_MEDIA_FROM_FOLDER, _filter2->storage_id, group_name); else @@ -1446,7 +1426,6 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter char *option_query = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); #ifdef _USE_TVPD_MODE if (group < MEDIA_PVR_GROUP_DURATION) { /*media content */ if (group_name != NULL) { @@ -1532,7 +1511,6 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi sqlite3_stmt *stmt = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); #ifdef _USE_TVPD_MODE if (group_name != NULL) { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) @@ -1664,8 +1642,6 @@ int _media_db_get_pvr_group_item(const char *group_name, filter_h filter, media_ sqlite3_stmt *stmt = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); - if (group_name != NULL) { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) sqlite3_snprintf(sizeof(select_query), select_query, SELECT_PVR_FROM_GROUP_BY_STORAGE_ID, _filter->storage_id, __media_db_get_group_name(group), group_name); @@ -1885,8 +1861,6 @@ int _media_db_get_pvr(filter_h filter, media_pvr_cb callback, void *user_data) sqlite3_stmt *stmt = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); - if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_PVR_LIST_BY_STORAGE_ID, _filter->storage_id); else @@ -1984,8 +1958,6 @@ int _media_db_get_uhd(filter_h filter, media_uhd_cb callback, void *user_data) sqlite3_stmt *stmt = NULL; filter_s *_filter = (filter_s *)filter; - memset(select_query, 0x00, sizeof(select_query)); - if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_UHD_LIST_BY_STORAGE_ID, _filter->storage_id); else diff --git a/src/media_folder.c b/src/media_folder.c index ac44f49..96242c8 100755 --- a/src/media_folder.c +++ b/src/media_folder.c @@ -317,7 +317,7 @@ int media_folder_get_folder_from_db(const char *folder_id, media_folder_h *folde { int ret = MEDIA_CONTENT_ERROR_NONE; sqlite3_stmt *stmt = NULL; - char select_query[DEFAULT_QUERY_SIZE]; + char select_query[DEFAULT_QUERY_SIZE] = {0, }; media_folder_s *_folder = NULL; if (!STRING_VALID(folder_id)) { @@ -325,7 +325,6 @@ int media_folder_get_folder_from_db(const char *folder_id, media_folder_h *folde return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - memset(select_query, 0x00, sizeof(select_query)); snprintf(select_query, sizeof(select_query), SELECT_FOLDER_FROM_FOLDER, folder_id); ret = _content_get_result(select_query, &stmt); @@ -392,7 +391,6 @@ int media_folder_set_name(media_folder_h folder, const char *name) char new_folder_path[MAX_PATH_LEN] = {0,}; char repl_path[MAX_PATH_LEN] = {0, }; - memset(repl_path, 0, sizeof(repl_path)); ret = _media_content_replace_path(_folder->path, repl_path); content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); @@ -426,12 +424,12 @@ int media_folder_set_name(media_folder_h folder, const char *name) int media_folder_insert_to_db(const char *path) { - char repl_path[MAX_PATH_LEN] = {0, }; int ret = MEDIA_CONTENT_ERROR_NONE; + char repl_path[MAX_PATH_LEN] = {0, }; char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, }; content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid path"); - memset(repl_path, 0, sizeof(repl_path)); + ret = _media_content_replace_path(path, repl_path); content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); diff --git a/src/media_group.c b/src/media_group.c index e60ff77..e44a480 100755 --- a/src/media_group.c +++ b/src/media_group.c @@ -83,8 +83,6 @@ int media_album_get_album_from_db(int album_id, media_album_h *album) content_retvm_if(album_id <= 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid album_id [%d]", album_id); content_retvm_if(album == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid album"); - memset(select_query, 0x00, sizeof(select_query)); - snprintf(select_query, sizeof(select_query), SELECT_ALBUM_FROM_ALBUM, album_id); ret = _content_get_result(select_query, &stmt); diff --git a/src/media_info.c b/src/media_info.c index 791b1fb..6bdfec0 100644 --- a/src/media_info.c +++ b/src/media_info.c @@ -422,14 +422,13 @@ int media_info_insert_to_db(const char *path, media_info_h *info) content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid path"); content_retvm_if(info == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid info"); - memset(repl_path, 0, sizeof(repl_path)); + ret = _media_content_replace_path(path, repl_path); content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); ret = __media_info_check_file_validity(repl_path); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - memset(storage_id, 0x00, sizeof(storage_id)); ret = media_svc_get_storage_id(_content_get_db_handle(), repl_path, storage_id, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { content_error("media_svc_get_storage_id failed : %d", ret); @@ -524,12 +523,12 @@ int media_info_insert_batch_to_db(const char **path_array, unsigned int array_le #ifdef _USE_TVPD_MODE int media_info_get_media_info_by_path_from_db(const char* path, media_info_h* media) { - char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0,}; int ret = MEDIA_CONTENT_ERROR_NONE; + char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, }; + content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid path"); content_retvm_if(media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid info"); - memset(storage_id, 0x00, sizeof(storage_id)); ret = media_svc_get_storage_id(_content_get_db_handle(), path, storage_id, tzplatform_getuid(TZ_USER_NAME)); if (ret != MS_MEDIA_ERR_NONE) { content_error("media_svc_get_storage_id failed : %d", ret); @@ -1808,8 +1807,6 @@ int media_info_get_media_from_db(const char *media_id, media_info_h *media) return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - memset(select_query, 0x00, sizeof(select_query)); - #ifdef _USE_TVPD_MODE char *storage_id = NULL; @@ -1939,7 +1936,7 @@ int media_info_move_to_db(media_info_h media, const char* dst_path) content_retvm_if(media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid media"); content_retvm_if(!STRING_VALID(dst_path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid dst_path"); - memset(repl_path, 0, sizeof(repl_path)); + ret = _media_content_replace_path(dst_path, repl_path); content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); diff --git a/src/media_playlist.c b/src/media_playlist.c index 96e8126..172bbbb 100755 --- a/src/media_playlist.c +++ b/src/media_playlist.c @@ -196,7 +196,6 @@ static int __media_playlist_import_item_from_file(const char *playlist_path, GSL return MEDIA_CONTENT_ERROR_INVALID_OPERATION; } - memset(tmp_str, 0, sizeof(tmp_str)); while (fgets(tmp_str, MAX_PATH_LEN, fp) != NULL) { memset(repl_item, 0, sizeof(repl_item)); _media_content_replace_path(tmp_str, repl_item); @@ -626,7 +625,6 @@ int media_playlist_import_from_file(const char *path, const char *playlist_name, content_retip_if_fail(STRING_VALID(path)); content_retip_if_fail(STRING_VALID(playlist_name)); - memset(repl_path, 0, sizeof(repl_path)); ret = _media_content_replace_path(path, repl_path); content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); @@ -656,7 +654,6 @@ int media_playlist_export_to_file(media_playlist_h playlist, const char *path) content_retip_if_fail(playlist); content_retipm_if_fail(_playlist->playlist_id > 0, "%d", _playlist->playlist_id); - memset(repl_path, 0, sizeof(repl_path)); ret = _media_content_replace_path(path, repl_path); content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); diff --git a/src/media_storage.c b/src/media_storage.c index 54d2930..7a30d04 100755 --- a/src/media_storage.c +++ b/src/media_storage.c @@ -30,7 +30,6 @@ int media_storage_get_storage_info_from_db(const char *storage_id, media_storage return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - memset(select_query, 0x00, sizeof(select_query)); snprintf(select_query, sizeof(select_query), SELECT_STORAGE_INFO_FROM_STORAGE, storage_id); ret = _content_get_result(select_query, &stmt); diff --git a/src/media_util_private.c b/src/media_util_private.c index c8ca777..2e1bfda 100755 --- a/src/media_util_private.c +++ b/src/media_util_private.c @@ -240,7 +240,6 @@ bool _media_util_is_ignorable_dir(const char *dir_path) char *leaf_path = NULL; char search_path[MAX_PATH_LEN] = {0, }; - memset(search_path, 0, sizeof(search_path)); SAFE_STRLCPY(search_path, dir_path, sizeof(search_path)); while (STRING_VALID(search_path)) {