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

Cleanup read_generic_file

Browse Source
This commit is contained in:
twinaphex 2015-03-21 09:40:29 +01:00
parent 414d964a8b
commit 08f13ccc0d
1 changed files with 13 additions and 12 deletions

25
file_ops.c

@ -87,8 +87,9 @@ bool write_file(const char *path, const void *data, ssize_t size)
*/ */
static int read_generic_file(const char *path, void **buf, ssize_t *len) static int read_generic_file(const char *path, void **buf, ssize_t *len)
{ {
long ret = 0, _len = 0; long ret = 0;
void *rom_buf = NULL; size_t content_buf_size = 0;
void *content_buf = NULL;
FILE *file = fopen(path, "rb"); FILE *file = fopen(path, "rb");
@ -98,28 +99,28 @@ static int read_generic_file(const char *path, void **buf, ssize_t *len)
if (fseek(file, 0, SEEK_END) != 0) if (fseek(file, 0, SEEK_END) != 0)
goto error; goto error;
_len = ftell(file); content_buf_size = ftell(file);
if (_len < 0) if (content_buf_size < 0)
goto error; goto error;
rewind(file); rewind(file);
rom_buf = malloc(_len + 1); content_buf = malloc(content_buf_size + 1);
if (!rom_buf) if (!content_buf)
goto error; goto error;
if ((ret = fread(rom_buf, 1, _len, file)) < _len) if ((ret = fread(content_buf, 1, content_buf_size, file)) < content_buf_size)
RARCH_WARN("Didn't read whole file.\n"); RARCH_WARN("Didn't read whole file.\n");
if (!rom_buf) if (!content_buf)
goto error; goto error;
*buf = rom_buf; *buf = content_buf;
/* Allow for easy reading of strings to be safe. /* Allow for easy reading of strings to be safe.
* Will only work with sane character formatting (Unix). */ * Will only work with sane character formatting (Unix). */
((char*)rom_buf)[_len] = '\0'; ((char*)content_buf)[content_buf_size] = '\0';
if (fclose(file) != 0) if (fclose(file) != 0)
RARCH_WARN("Failed to close file stream.\n"); RARCH_WARN("Failed to close file stream.\n");
@ -132,8 +133,8 @@ static int read_generic_file(const char *path, void **buf, ssize_t *len)
error: error:
if (file) if (file)
fclose(file); fclose(file);
if (rom_buf) if (content_buf)
free(rom_buf); free(content_buf);
if (len) if (len)
*len = -1; *len = -1;
*buf = NULL; *buf = NULL;