From b0f0f1c0c20862a95151a217acffda9e4c7db92a Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Mon, 14 May 2018 14:12:41 +0900 Subject: [PATCH] Remove unused parameter from plugin function Remove scan_status from get_storage_list. It is unused in function. Change-Id: I452c88febe35e04fbff7a520b4051f3f47baf992 Signed-off-by: Minje Ahn --- include/media-svc.h | 2 +- plugin/media-content-plugin.c | 4 ++-- src/common/media-svc-db-utils.c | 4 ---- src/common/media-svc-storage.c | 12 +++--------- src/common/media-svc.c | 4 ++-- src/include/common/media-svc-storage.h | 2 +- 6 files changed, 9 insertions(+), 19 deletions(-) diff --git a/include/media-svc.h b/include/media-svc.h index 68568c7..ca003fc 100755 --- a/include/media-svc.h +++ b/include/media-svc.h @@ -75,7 +75,7 @@ int media_svc_update_storage(MediaSvcHandle *handle, const char *storage_id, con int media_svc_set_storage_validity(MediaSvcHandle *handle, const char *storage_id, int validity, uid_t uid); int media_svc_get_storage_id(MediaSvcHandle *handle, const char *path, char *storage_id, uid_t uid); int media_svc_get_storage_path(MediaSvcHandle *handle, const char *storage_uuid, char **storage_path); -int media_svc_get_storage_list(MediaSvcHandle *handle, char ***storage_list, char ***storage_id_list, int **scan_status_list, int *count); +int media_svc_get_storage_list(MediaSvcHandle *handle, char ***storage_list, char ***storage_id_list, int *count); int media_svc_delete_invalid_folder(const char *storage_id, int storage_type, uid_t uid); int media_svc_set_folder_validity(MediaSvcHandle *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid); diff --git a/plugin/media-content-plugin.c b/plugin/media-content-plugin.c index 9c7fb23..d553e89 100755 --- a/plugin/media-content-plugin.c +++ b/plugin/media-content-plugin.c @@ -575,7 +575,7 @@ int set_storage_scan_status(void *handle, const char *storage_id, int status, ui return MEDIA_SVC_PLUGIN_ERROR_NONE; } -int get_storage_list(void *handle, char ***storage_list, char ***storage_id_list, int **scan_status_list, int *count, char **err_msg) +int get_storage_list(void *handle, char ***storage_list, char ***storage_id_list, int *count, char **err_msg) { int ret = MEDIA_SVC_PLUGIN_ERROR_NONE; @@ -589,7 +589,7 @@ int get_storage_list(void *handle, char ***storage_list, char ***storage_id_list return MEDIA_SVC_PLUGIN_ERROR; } - ret = media_svc_get_storage_list(handle, storage_list, storage_id_list, scan_status_list, count); + ret = media_svc_get_storage_list(handle, storage_list, storage_id_list, count); if (ret < 0) { __set_error_message(ret, err_msg); return MEDIA_SVC_PLUGIN_ERROR; diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c index 9ae5a4a..3566895 100755 --- a/src/common/media-svc-db-utils.c +++ b/src/common/media-svc-db-utils.c @@ -701,8 +701,6 @@ int _media_svc_init_table_query(const char *event_table_name) media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FOLDER], "validity", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 1", USER_V4, NULL, false, false, false); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); - ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FOLDER], "scan_status", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", USER_V4, NULL, false, false, false); - media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); /*playlist_map*/ ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_PLAYLIST_MAP], "_id", MEDIA_SVC_DB_TYPE_INT, "PRIMARY KEY AUTOINCREMENT", USER_V2, NULL, false, false, true); @@ -769,8 +767,6 @@ int _media_svc_init_table_query(const char *event_table_name) media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_STORAGE], "storage_type", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", USER_V3, NULL, false, false, false); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); - ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_STORAGE], "scan_status", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", USER_V3, NULL, false, false, false); - media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_STORAGE], "validity", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 1", USER_V3, NULL, false, false, false); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c index fde30cf..c4adce3 100755 --- a/src/common/media-svc-storage.c +++ b/src/common/media-svc-storage.c @@ -310,7 +310,7 @@ static int __media_svc_count_all_storage(sqlite3 *handle, int *count) return MS_MEDIA_ERR_NONE; } -int _media_svc_get_all_storage(sqlite3 *handle, char ***storage_list, char ***storage_id_list, int **scan_status_list, int *count) +int _media_svc_get_all_storage(sqlite3 *handle, char ***storage_list, char ***storage_id_list, int *count) { int ret = MS_MEDIA_ERR_NONE; int idx = 0; @@ -325,21 +325,18 @@ int _media_svc_get_all_storage(sqlite3 *handle, char ***storage_list, char ***st } if (cnt > 0) { - sql = sqlite3_mprintf("SELECT storage_path, storage_uuid, scan_status FROM '%q' WHERE validity = 1", MEDIA_SVC_DB_TABLE_STORAGE); + sql = sqlite3_mprintf("SELECT storage_path, storage_uuid FROM '%q' WHERE validity = 1", MEDIA_SVC_DB_TABLE_STORAGE); } else { *storage_list = NULL; - *scan_status_list = NULL; return MS_MEDIA_ERR_NONE; } *storage_list = malloc(sizeof(char *) * cnt); *storage_id_list = malloc(sizeof(char *) * cnt); - *scan_status_list = malloc(sizeof(int) * cnt); - if (*storage_list == NULL || *storage_id_list == NULL || *scan_status_list == NULL) { + if (*storage_list == NULL || *storage_id_list == NULL) { media_svc_error("Allocation failed"); SAFE_FREE(*storage_list); SAFE_FREE(*storage_id_list); - SAFE_FREE(*scan_status_list); SQLITE3_SAFE_FREE(sql); return MS_MEDIA_ERR_OUT_OF_MEMORY; } @@ -349,7 +346,6 @@ int _media_svc_get_all_storage(sqlite3 *handle, char ***storage_list, char ***st media_svc_error("prepare error [%s]", sqlite3_errmsg(handle)); SAFE_FREE(*storage_list); SAFE_FREE(*storage_id_list); - SAFE_FREE(*scan_status_list); return ret; } @@ -358,7 +354,6 @@ int _media_svc_get_all_storage(sqlite3 *handle, char ***storage_list, char ***st while (1) { (*storage_list)[idx] = g_strdup((char *)sqlite3_column_text(sql_stmt, 0)); (*storage_id_list)[idx] = g_strdup((char *)sqlite3_column_text(sql_stmt, 1)); - (*scan_status_list)[idx] = (int)sqlite3_column_int(sql_stmt, 2); if (sqlite3_step(sql_stmt) != SQLITE_ROW) break; idx++; @@ -376,7 +371,6 @@ int _media_svc_get_all_storage(sqlite3 *handle, char ***storage_list, char ***st } SAFE_FREE(*storage_list); SAFE_FREE(*storage_id_list); - SAFE_FREE(*scan_status_list); *count = 0; ret = MS_MEDIA_ERR_INTERNAL; } diff --git a/src/common/media-svc.c b/src/common/media-svc.c index 3efed61..7a8a24e 100755 --- a/src/common/media-svc.c +++ b/src/common/media-svc.c @@ -1156,7 +1156,7 @@ int media_svc_get_storage_path(MediaSvcHandle *handle, const char *storage_uuid, return ret; } -int media_svc_get_storage_list(MediaSvcHandle *handle, char ***storage_list, char ***storage_id_list, int **scan_status_list, int *count) +int media_svc_get_storage_list(MediaSvcHandle *handle, char ***storage_list, char ***storage_id_list, int *count) { sqlite3 * db_handle = (sqlite3 *)handle; @@ -1165,7 +1165,7 @@ int media_svc_get_storage_list(MediaSvcHandle *handle, char ***storage_list, cha media_svc_retvm_if(db_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(db_handle, storage_list, storage_id_list, scan_status_list, count); + return _media_svc_get_all_storage(db_handle, storage_list, storage_id_list, count); } static int __media_svc_copy_para_to_content(media_svc_content_info_s *content_info, media_svc_content_info_s *new_content_info) diff --git a/src/include/common/media-svc-storage.h b/src/include/common/media-svc-storage.h index 8285f53..bdf185c 100755 --- a/src/include/common/media-svc-storage.h +++ b/src/include/common/media-svc-storage.h @@ -31,6 +31,6 @@ int _media_svc_delete_invalid_storage(sqlite3 *handle, media_svc_storage_type_e int _media_svc_update_storage_validity(const char *storage_id, int validity, uid_t uid); int _media_svc_get_storage_uuid(sqlite3 *handle, const char *path, char *storage_id, uid_t uid); int _media_svc_get_storage_path(sqlite3 *handle, const char *storage_id, char **storage_path); -int _media_svc_get_all_storage(sqlite3 *handle, char ***storage_list, char ***storage_id_list, int **scan_status_list, int *count); +int _media_svc_get_all_storage(sqlite3 *handle, char ***storage_list, char ***storage_id_list, int *count); #endif /*_MEDIA_SVC_STORAGE_H_*/ -- 2.7.4