mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use retro_read_file in more places

Browse Source
This commit is contained in:
twinaphex 2016-01-30 03:58:33 +01:00
parent 9371d3ae48
commit 9ab31824f8
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/drivers_shader/shader_glsl.c
View File

@ -19,6 +19,7 @@
#include <compat/strl.h> #include <compat/strl.h>
#include <compat/posix_string.h> #include <compat/posix_string.h>
#include <file/file_path.h> #include <file/file_path.h>
#include <retro_file.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#include "../../general.h" #include "../../general.h"
@ -463,7 +464,8 @@ static bool gl_glsl_load_source_path(struct video_shader_pass *pass,
const char *path) const char *path)
{ {
ssize_t len; ssize_t len;
bool ret = read_file(path, (void**)&pass->source.string.vertex, &len); bool ret = retro_read_file(path,
(void**)&pass->source.string.vertex, &len);
if (!ret || len <= 0) if (!ret || len <= 0)
return false; return false;
@ -472,7 +474,8 @@ static bool gl_glsl_load_source_path(struct video_shader_pass *pass,
return pass->source.string.fragment && pass->source.string.vertex; return pass->source.string.fragment && pass->source.string.vertex;
} }
static bool gl_glsl_compile_programs(glsl_shader_data_t *glsl, GLuint *gl_prog) static bool gl_glsl_compile_programs(
glsl_shader_data_t *glsl, GLuint *gl_prog)
{ {
unsigned i; unsigned i;
@ -487,9 +490,11 @@ static bool gl_glsl_compile_programs(glsl_shader_data_t *glsl, GLuint *gl_prog)
* load the file here, and pretend * load the file here, and pretend
* we were really using XML all along. * we were really using XML all along.
*/ */
if (*pass->source.path && !gl_glsl_load_source_path(pass, pass->source.path)) if (*pass->source.path && !gl_glsl_load_source_path(
pass, pass->source.path))
{ {
RARCH_ERR("Failed to load GLSL shader: %s.\n", pass->source.path); RARCH_ERR("Failed to load GLSL shader: %s.\n",
pass->source.path);
return false; return false;
} }
*pass->source.path = '\0'; *pass->source.path = '\0';

5
gfx/video_state_python.c
View File

@ -21,6 +21,7 @@
#include <compat/strl.h> #include <compat/strl.h>
#include <compat/posix_string.h> #include <compat/posix_string.h>
#include <retro_file.h>
#include "video_state_python.h" #include "video_state_python.h"
#include "../dynamic.h" #include "../dynamic.h"
@ -302,7 +303,9 @@ py_state_t *py_state_new(const char *script,
* compiled with MSVC. */ * compiled with MSVC. */
ssize_t len; ssize_t len;
char *script_ = NULL; char *script_ = NULL;
bool ret = read_file(script, (void**)&script_, &len); bool ret = retro_read_file
(script, (void**)&script_, &len);
if (!ret || len < 0) if (!ret || len < 0)
{ {
RARCH_ERR("Python: Failed to read script\n"); RARCH_ERR("Python: Failed to read script\n");

3
patch.c
View File

@ -25,6 +25,7 @@
#include <compat/msvc.h> #include <compat/msvc.h>
#include <file/file_path.h> #include <file/file_path.h>
#include <file/file_archive.h> #include <file/file_archive.h>
#include <retro_file.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#include "patch.h" #include "patch.h"
@ -491,7 +492,7 @@ static bool apply_patch_content(uint8_t **buf,
ssize_t ret_size = *size; ssize_t ret_size = *size;
uint8_t *ret_buf = *buf; uint8_t *ret_buf = *buf;
if (!read_file(patch_path, &patch_data, &patch_size)) if (!retro_read_file(patch_path, &patch_data, &patch_size))
return false; return false;
if (patch_size < 0) if (patch_size < 0)
return false; return false;

2
tasks/task_database.c
View File

@ -201,7 +201,7 @@ static int database_info_iterate_playlist(
default: default:
{ {
ssize_t ret; ssize_t ret;
int read_from = read_file(name, (void**)&db_state->buf, &ret); int read_from = retro_read_file(name, (void**)&db_state->buf, &ret);
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
const struct file_archive_file_backend *stream_backend = const struct file_archive_file_backend *stream_backend =
file_archive_get_default_file_backend(); file_archive_get_default_file_backend();