From 14532ce84211db6130a235aa77c36f347e9e4f85 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Tue, 2 Feb 2016 11:44:43 +0900 Subject: [PATCH] Remove unused parameter Change-Id: I6bef2a0a3cfe4221d84c971bd0434075ba3df8d3 Signed-off-by: Minje Ahn --- include/media-svc.h | 2 +- plugin/media-content-plugin.c | 4 ++-- src/common/media-svc-db-utils.c | 5 +---- src/common/media-svc.c | 4 ++-- src/include/common/media-svc-db-utils.h | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/include/media-svc.h b/include/media-svc.h index 2c40d1c..bf31747 100755 --- a/include/media-svc.h +++ b/include/media-svc.h @@ -60,7 +60,7 @@ int media_svc_get_storage_type(const char *path, media_svc_storage_type_e *stora int media_svc_get_file_info(MediaSvcHandle *handle, const char *storage_id, const char *path, time_t *modified_time, unsigned long long *size); int media_svc_send_dir_update_noti(MediaSvcHandle *handle, const char *storage_id, const char *dir_path, const char *folder_id, media_item_update_type_e update_type, int pid); int media_svc_count_invalid_items_in_folder(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, int *count); -int media_svc_check_db_upgrade(MediaSvcHandle *handle, bool *need_full_scan, int user_version, uid_t uid); +int media_svc_check_db_upgrade(MediaSvcHandle *handle, int user_version, uid_t uid); int media_svc_check_db_corrupt(MediaSvcHandle *handle); int media_svc_get_folder_list(MediaSvcHandle *handle, char *start_path, char ***folder_list, time_t **modified_time_list, int **item_num_list, int *count); int media_svc_update_folder_time(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, uid_t uid); diff --git a/plugin/media-content-plugin.c b/plugin/media-content-plugin.c index f713f17..4d31135 100755 --- a/plugin/media-content-plugin.c +++ b/plugin/media-content-plugin.c @@ -510,7 +510,7 @@ int count_delete_items_in_folder(void *handle, const char *storage_id, const cha return MEDIA_SVC_PLUGIN_ERROR_NONE; } -int check_db(void *handle, bool *need_full_scan, uid_t uid, char **err_msg) +int check_db(void *handle, uid_t uid, char **err_msg) { int ret = MEDIA_SVC_PLUGIN_ERROR_NONE; int user_version = -1; @@ -530,7 +530,7 @@ int check_db(void *handle, bool *need_full_scan, uid_t uid, char **err_msg) } } else { /*check db version*/ - ret = media_svc_check_db_upgrade(handle, need_full_scan, user_version, uid); + ret = media_svc_check_db_upgrade(handle, user_version, uid); 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 1215e09..8154fd7 100755 --- a/src/common/media-svc-db-utils.c +++ b/src/common/media-svc-db-utils.c @@ -1356,12 +1356,9 @@ void _media_svc_sql_query_release(GList **query_list) } } -int _media_svc_check_db_upgrade(sqlite3 *db_handle, bool *need_full_scan, int user_version, uid_t uid) +int _media_svc_check_db_upgrade(sqlite3 *db_handle, int user_version, uid_t uid) { if (user_version < LATEST_VERSION_NUMBER) { - if (user_version < USER_V4) { - *need_full_scan = true; - } media_svc_error("Current DB is out of date(%d).. So start to upgrade DB(%d)", user_version, LATEST_VERSION_NUMBER); return __media_svc_db_upgrade(db_handle, user_version, uid); } else { diff --git a/src/common/media-svc.c b/src/common/media-svc.c index 7e850e7..e6a1ee6 100755 --- a/src/common/media-svc.c +++ b/src/common/media-svc.c @@ -1223,7 +1223,7 @@ int media_svc_count_invalid_items_in_folder(MediaSvcHandle *handle, const char * return _media_svc_count_invalid_folder_items(db_handle, storage_id, folder_path, count); } -int media_svc_check_db_upgrade(MediaSvcHandle *handle, bool *need_full_scan, int user_version, uid_t uid) +int media_svc_check_db_upgrade(MediaSvcHandle *handle, int user_version, uid_t uid) { sqlite3 *db_handle = (sqlite3 *)handle; @@ -1231,7 +1231,7 @@ int media_svc_check_db_upgrade(MediaSvcHandle *handle, bool *need_full_scan, int media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL"); - return _media_svc_check_db_upgrade(db_handle, need_full_scan, user_version, uid); + return _media_svc_check_db_upgrade(db_handle, user_version, uid); } int media_svc_check_db_corrupt(MediaSvcHandle *handle) diff --git a/src/include/common/media-svc-db-utils.h b/src/include/common/media-svc-db-utils.h index 9d2d3ef..cf9ffc5 100755 --- a/src/include/common/media-svc-db-utils.h +++ b/src/include/common/media-svc-db-utils.h @@ -46,7 +46,7 @@ int _media_svc_sql_rollback_trans(uid_t uid); int _media_svc_sql_query_list(GList **query_list, uid_t uid); void _media_svc_sql_query_add(GList **query_list, char **query); void _media_svc_sql_query_release(GList **query_list); -int _media_svc_check_db_upgrade(sqlite3 *db_handle, bool *need_full_scan, int user_version, uid_t uid); +int _media_svc_check_db_upgrade(sqlite3 *db_handle, int user_version, uid_t uid); int _media_db_check_corrupt(sqlite3 *db_handle); char *_media_svc_get_path(uid_t uid); -- 2.7.4