Fix build error for VD Code

[platform/core/api/media-content.git] / src / media_storage.c

diff --git a/src/media_storage.c b/src/media_storage.c
index edf6d2e..acb72eb 100755 (executable)
--- a/src/media_storage.c
+++ b/src/media_storage.c
@@ -23,6 +23,7 @@ int media_storage_get_storage_info_from_db(const char *storage_id, media_storage
        media_content_warn("DEPRECATION WARNING: media_storage_get_storage_info_from_db() is deprecated and will be removed from next release.");
        char select_query[DEFAULT_QUERY_SIZE] = {0, };
        sqlite3_stmt *stmt = NULL;
+       media_storage_s *_storage = NULL;
 
        if (!STRING_VALID(storage_id) || (storage == NULL)) {
                media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
@@ -32,11 +33,11 @@ int media_storage_get_storage_info_from_db(const char *storage_id, media_storage
        memset(select_query, 0x00, sizeof(select_query));
        snprintf(select_query, sizeof(select_query), SELECT_STORAGE_INFO_FROM_STORAGE, storage_id);
 
-       ret = _content_query_prepare(&stmt, select_query, NULL, NULL);
+       ret = _content_get_result(select_query, &stmt);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
-       while (sqlite3_step(stmt) == SQLITE_ROW) {
-               media_storage_s *_storage = (media_storage_s*)calloc(1, sizeof(media_storage_s));
+       if (sqlite3_step(stmt) == SQLITE_ROW) {
+               _storage = (media_storage_s*)calloc(1, sizeof(media_storage_s));
 
                if (_storage == NULL) {
                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
@@ -44,11 +45,14 @@ int media_storage_get_storage_info_from_db(const char *storage_id, media_storage
                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                }
 
-               _storage->storage_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
-               _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 1));
-               _storage->storage_type = (int)sqlite3_column_int(stmt, 2);
+               _storage->storage_id = g_strdup(storage_id);
+               _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 0));
+               _storage->storage_type = (int)sqlite3_column_int(stmt, 1);
 
                *storage = (media_storage_h)_storage;
+       } else {
+               media_content_error("Nonexistent storage id[%s]", storage_id);
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
        SQLITE3_FINALIZE(stmt);
@@ -207,22 +211,6 @@ int media_storage_get_id(media_storage_h storage, char **storage_id)
        return ret;
 }
 
-int media_storage_get_name(media_storage_h storage, char **storage_name)
-{
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-       media_content_warn("DEPRECATION WARNING: media_storage_get_name() is deprecated and will be removed from next release.");
-       media_storage_s *_storage = (media_storage_s*)storage;
-
-       if (_storage && storage_name) {
-               *storage_name = NULL;
-       } else {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       return ret;
-}
-
 int media_storage_get_path(media_storage_h storage, char **storage_path)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
@@ -273,7 +261,7 @@ int media_storage_get_scan_status(const char *storage_uuid, media_storage_scan_s
                ret = media_svc_get_storage_scan_status(_content_get_db_handle(), storage_uuid, &status);
                if (ret != MS_MEDIA_ERR_NONE) {
                        media_content_error("media_svc_get_storage_scan_status failed");
-                       ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret);
+                       ret = _content_error_capi(ret);
                } else {
                        *scan_status = status;
                }