From cf9341f2ea04b80bf1da7ebea22530392fd901cf Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 17 Oct 2018 05:45:43 +0200 Subject: [PATCH] Update libretro-common --- .../include/streams/file_stream_transforms.h | 4 ++++ .../streams/file_stream_transforms.c | 22 ++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/libretro-common/include/streams/file_stream_transforms.h b/libretro-common/include/streams/file_stream_transforms.h index 17c17580e9..9cf15c599d 100644 --- a/libretro-common/include/streams/file_stream_transforms.h +++ b/libretro-common/include/streams/file_stream_transforms.h @@ -47,6 +47,7 @@ RETRO_BEGIN_DECLS #undef fprintf #undef ferror #undef feof +#undef fscanf #define fopen rfopen #define fclose rfclose @@ -61,6 +62,7 @@ RETRO_BEGIN_DECLS #define fprintf rfprintf #define ferror rferror #define feof rfeof +#define fscanf rfscanf #endif @@ -92,6 +94,8 @@ int rferror(RFILE* stream); int rfeof(RFILE* stream); +int rfscanf(RFILE * stream, const char * format, ...); + RETRO_END_DECLS #endif diff --git a/libretro-common/streams/file_stream_transforms.c b/libretro-common/streams/file_stream_transforms.c index fc1e1bd160..5a82f88c73 100644 --- a/libretro-common/streams/file_stream_transforms.c +++ b/libretro-common/streams/file_stream_transforms.c @@ -109,7 +109,7 @@ char *rfgets(char *buffer, int maxCount, RFILE* stream) int rfgetc(RFILE* stream) { - return filestream_getc(stream); + return filestream_getc(stream); } int64_t rfwrite(void const* buffer, @@ -131,11 +131,11 @@ int64_t rfflush(RFILE * stream) int rfprintf(RFILE * stream, const char * format, ...) { int result; - va_list vl; - va_start(vl, format); - result = filestream_vprintf(stream, format, vl); - va_end(vl); - return result; + va_list vl; + va_start(vl, format); + result = filestream_vprintf(stream, format, vl); + va_end(vl); + return result; } int rferror(RFILE* stream) @@ -147,3 +147,13 @@ int rfeof(RFILE* stream) { return filestream_eof(stream); } + +int rfscanf(RFILE * stream, const char * format, ...) +{ + int result; + va_list vl; + va_start(vl, format); + result = filestream_scanf(stream, format, vl); + va_end(vl); + return result; +}