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);
if (sqlite3_step(stmt) == SQLITE_ROW) {
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 {
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;
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;
}