Squashed 'libretro-common/' changes from 1548bee835..b857ce7fc5

b857ce7fc5 Cleanups

git-subtree-dir: libretro-common
git-subtree-split: b857ce7fc55d725246a095f766e2bb82bb1d4ce6
This commit is contained in:
twinaphex 2018-07-05 02:10:00 +02:00
parent a078d40b80
commit aa9ebf5f29

View File

@ -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++;
}