From aa9ebf5f29e1a22a5050572353b122915db1451d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 5 Jul 2018 02:10:00 +0200 Subject: [PATCH] Squashed 'libretro-common/' changes from 1548bee835..b857ce7fc5 b857ce7fc5 Cleanups git-subtree-dir: libretro-common git-subtree-split: b857ce7fc55d725246a095f766e2bb82bb1d4ce6 --- streams/file_stream.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/streams/file_stream.c b/streams/file_stream.c index 2718fbc49e..06b587b005 100644 --- a/streams/file_stream.c +++ b/streams/file_stream.c @@ -196,16 +196,13 @@ int filestream_scanf(RFILE *stream, const char* format, ...) { char buf[4096]; char subfmt[64]; - - const char * bufiter = buf; - - int64_t startpos = filestream_tell(stream); - va_list args; - int ret = 0; - - int maxlen = filestream_read(stream, buf, sizeof(buf)-1); + const char * bufiter = buf; + int64_t startpos = filestream_tell(stream); + int ret = 0; + int64_t maxlen = filestream_read(stream, buf, sizeof(buf)-1); + buf[maxlen] = '\0'; va_start(args, format); @@ -214,14 +211,12 @@ int filestream_scanf(RFILE *stream, const char* format, ...) { if (*format == '%') { - char* subfmtiter = subfmt; - - int subret; int sublen; - bool asterisk = false; + char* subfmtiter = subfmt; + bool asterisk = false; - *subfmtiter++ = *format++; /* '%' */ + *subfmtiter++ = *format++; /* '%' */ /* %[*][width][length]specifier */ @@ -276,7 +271,8 @@ int filestream_scanf(RFILE *stream, const char* format, ...) } else { - if (*bufiter != *format) break; + if (*bufiter != *format) + break; bufiter++; format++; }