Remove unused parameters in plugin API

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

diff --git a/include/media-svc.h b/include/media-svc.h
index e14324c..830d05d 100755 (executable)
--- a/include/media-svc.h
+++ b/include/media-svc.h
@@ -75,10 +75,10 @@ void media_svc_destroy_content_info(media_svc_content_info_s *content_info);
 
 int media_svc_generate_uuid(char **uuid);
 int media_svc_get_mmc_info(MediaSvcHandle *handle, char **storage_name, char **storage_path, int *validity, bool *info_exist);
-int media_svc_check_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, char **storage_path, int *validity, uid_t uid);
+int media_svc_check_storage(MediaSvcHandle *handle, const char *storage_id, char **storage_path, int *validity, uid_t uid);
 int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid);
 int media_svc_update_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_path, uid_t uid);
-int media_svc_delete_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, uid_t uid);
+int media_svc_delete_storage(MediaSvcHandle *handle, const char *storage_id, uid_t uid);
 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);

diff --git a/plugin/media-content-plugin.c b/plugin/media-content-plugin.c
index 0040b13..4a61a07 100755 (executable)
--- a/plugin/media-content-plugin.c
+++ b/plugin/media-content-plugin.c
@@ -585,7 +585,7 @@ int get_mmc_info(void * handle, char **storage_name, char **storage_path, int *v
        return MEDIA_SVC_PLUGIN_ERROR_NONE;
 }
 
-int check_storage(void * handle, const char *storage_id, const char *storage_name, char **storage_path, int *validity, uid_t uid, char **err_msg)
+int check_storage(void * handle, const char *storage_id, char **storage_path, int *validity, uid_t uid, char **err_msg)
 {
        int ret = MEDIA_SVC_PLUGIN_ERROR_NONE;
 
@@ -594,7 +594,7 @@ int check_storage(void * handle, const char *storage_id, const char *storage_nam
                return MEDIA_SVC_PLUGIN_ERROR;
        }
 
-       ret = media_svc_check_storage(handle, storage_id, storage_name, storage_path, validity, uid);
+       ret = media_svc_check_storage(handle, storage_id, storage_path, validity, uid);
        if (ret < 0) {
                __set_error_message(ret, err_msg);
                return MEDIA_SVC_PLUGIN_ERROR;
@@ -639,7 +639,7 @@ int update_storage(void *handle, const char *storage_id, const char *storage_pat
        return MEDIA_SVC_PLUGIN_ERROR_NONE;
 }
 
-int delete_storage(void * handle, const char *storage_id, const char *storage_name, uid_t uid, char **err_msg)
+int delete_storage(void * handle, const char *storage_id, uid_t uid, char **err_msg)
 {
        int ret = MEDIA_SVC_PLUGIN_ERROR_NONE;
 
@@ -648,7 +648,7 @@ int delete_storage(void * handle, const char *storage_id, const char *storage_na
                return MEDIA_SVC_PLUGIN_ERROR;
        }
 
-       ret = media_svc_delete_storage(handle, storage_id, storage_name, uid);
+       ret = media_svc_delete_storage(handle, storage_id, uid);
        if (ret < 0) {
                __set_error_message(ret, err_msg);
                return MEDIA_SVC_PLUGIN_ERROR;

diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c
index 5efce4d..1ef9f63 100755 (executable)
--- a/src/common/media-svc-storage.c
+++ b/src/common/media-svc-storage.c
@@ -55,7 +55,7 @@ int _media_svc_get_mmc_info(MediaSvcHandle *handle, char **storage_name, char **
        return MS_MEDIA_ERR_NONE;
 }
 
-int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, const char *storage_name, char **storage_path, int *validity, uid_t uid)
+int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **storage_path, int *validity, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
        sqlite3_stmt *sql_stmt = NULL;
@@ -64,13 +64,8 @@ int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, const char
        *storage_path = NULL;
        *validity = 0;
 
-       if (storage_name != NULL)
-               sql = sqlite3_mprintf("SELECT * FROM '%s' WHERE storage_uuid=%Q AND storage_name=%Q", MEDIA_SVC_DB_TABLE_STORAGE, storage_id, storage_name);
-       else
-               sql = sqlite3_mprintf("SELECT * FROM '%s' WHERE storage_uuid=%Q", MEDIA_SVC_DB_TABLE_STORAGE, storage_id);
-
+       sql = sqlite3_mprintf("SELECT * FROM '%s' WHERE storage_uuid=%Q", MEDIA_SVC_DB_TABLE_STORAGE, storage_id);
        ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
-
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        *storage_path = g_strdup((const char *)sqlite3_column_text(sql_stmt, 2));
@@ -123,7 +118,7 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons
        int validity = 0;
 
        /*Get old path*/
-       ret = _media_svc_check_storage(handle, storage_id, NULL, &old_storage_path, &validity, uid);
+       ret = _media_svc_check_storage(handle, storage_id, &old_storage_path, &validity, uid);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        /*Storage table update*/
@@ -154,14 +149,12 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons
        return ret;
 }
 
-int _media_svc_delete_storage(const char *storage_id, const char *storage_name, uid_t uid)
+int _media_svc_delete_storage(const char *storage_id, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
        char *sql = NULL;
 
-       if (storage_name != NULL)
-                       sql = sqlite3_mprintf("DELETE FROM '%s' WHERE storage_uuid=%Q AND storage_name=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, storage_id, storage_name);
-       else if (storage_id != NULL)
+       if (storage_id != NULL)
                sql = sqlite3_mprintf("DELETE FROM '%s' WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, storage_id);
 
        ret = _media_svc_sql_query(sql, uid);

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 57f517a..91ca17d 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -1587,7 +1587,7 @@ int media_svc_get_mmc_info(MediaSvcHandle *handle, char **storage_name, char **s
        return _media_svc_get_mmc_info(db_handle, storage_name, storage_path, validity, info_exist);
 }
 
-int media_svc_check_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, char **storage_path, int *validity, uid_t uid)
+int media_svc_check_storage(MediaSvcHandle *handle, const char *storage_id, char **storage_path, int *validity, uid_t uid)
 {
        sqlite3 * db_handle = (sqlite3 *)handle;
 
@@ -1596,7 +1596,7 @@ int media_svc_check_storage(MediaSvcHandle *handle, const char *storage_id, cons
        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(db_handle, storage_id, storage_name, storage_path, validity, uid);
+       return _media_svc_check_storage(db_handle, storage_id, storage_path, validity, uid);
 }
 
 int media_svc_update_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_path, uid_t uid)
@@ -1634,7 +1634,7 @@ int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, con
        return ret;
 }
 
-int media_svc_delete_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, uid_t uid)
+int media_svc_delete_storage(MediaSvcHandle *handle, const char *storage_id, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
        sqlite3 *db_handle = (sqlite3 *)handle;
@@ -1646,7 +1646,7 @@ int media_svc_delete_storage(MediaSvcHandle *handle, const char *storage_id, con
        ret = _media_svc_get_storage_type(db_handle, storage_id, &storage_type);
        media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_get_storage_type failed : %d", ret);
 
-       ret = _media_svc_delete_storage(storage_id, storage_name, uid);
+       ret = _media_svc_delete_storage(storage_id, uid);
        media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "remove storage failed : %d", ret);
 
        ret = _media_svc_delete_folder_by_storage_id(storage_id, storage_type, uid);

diff --git a/src/include/common/media-svc-storage.h b/src/include/common/media-svc-storage.h
index 500b4f8..0ff104c 100755 (executable)
--- a/src/include/common/media-svc-storage.h
+++ b/src/include/common/media-svc-storage.h
@@ -25,10 +25,10 @@
 #include <sqlite3.h>
 
 int _media_svc_get_mmc_info(MediaSvcHandle *handle, char **storage_name, char **storage_path, int *validity, bool *info_exist);
-int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, const char *storage_name, char **storage_path, int *validity, uid_t uid);
+int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **storage_path, int *validity, uid_t uid);
 int _media_svc_append_storage(const char *storage_id, const char *storage_name, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid);
 int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
-int _media_svc_delete_storage(const char *storage_id, const char *storage_name, uid_t uid);
+int _media_svc_delete_storage(const char *storage_id, uid_t uid);
 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_type(sqlite3 *handle, const char *storage_id, media_svc_storage_type_e *storage_type);