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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-06-26 19:07:38 +02:00
parent 808c00db41
commit 966348327d
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libretro-common/streams/file_stream.c
View File

@ -203,9 +203,7 @@ char* filestream_gets(RFILE *stream, char *s, size_t len)
int filestream_getc(RFILE *stream) int filestream_getc(RFILE *stream)
{ {
char c = 0; char c = 0;
if (!stream) if (stream && filestream_read(stream, &c, 1) == 1)
return EOF;
if (filestream_read(stream, &c, 1) == 1)
return (int)(unsigned char)c; return (int)(unsigned char)c;
return EOF; return EOF;
} }
@ -215,7 +213,6 @@ int filestream_scanf(RFILE *stream, const char* format, ...)
char buf[4096]; char buf[4096];
char subfmt[64]; char subfmt[64];
va_list args; va_list args;
const char * bufiter = buf; const char * bufiter = buf;
int64_t startpos = filestream_tell(stream); int64_t startpos = filestream_tell(stream);
int ret = 0; int ret = 0;
@ -233,7 +230,6 @@ int filestream_scanf(RFILE *stream, const char* format, ...)
if (*format == '%') if (*format == '%')
{ {
int sublen; int sublen;
char* subfmtiter = subfmt; char* subfmtiter = subfmt;
bool asterisk = false; bool asterisk = false;
@ -243,19 +239,25 @@ int filestream_scanf(RFILE *stream, const char* format, ...)
if (*format == '*') if (*format == '*')
{ {
asterisk = true; asterisk = true;
*subfmtiter++ = *format++; *subfmtiter++ = *format++;
} }
while (isdigit(*format)) *subfmtiter++ = *format++; /* width */ while (isdigit(*format))
*subfmtiter++ = *format++; /* width */
/* length */ /* length */
if (*format == 'h' || *format == 'l') if (*format == 'h' || *format == 'l')
{ {
if (format[1] == format[0]) *subfmtiter++ = *format++; if (format[1] == format[0])
*subfmtiter++ = *format++; *subfmtiter++ = *format++;
*subfmtiter++ = *format++;
} }
else if (*format == 'j' || *format == 'z' || *format == 't' || *format == 'L') else if (
*format == 'j' ||
*format == 'z' ||
*format == 't' ||
*format == 'L')
{ {
*subfmtiter++ = *format++; *subfmtiter++ = *format++;
} }
@ -263,14 +265,16 @@ int filestream_scanf(RFILE *stream, const char* format, ...)
/* specifier - always a single character (except ]) */ /* specifier - always a single character (except ]) */
if (*format == '[') if (*format == '[')
{ {
while (*format != ']') *subfmtiter++ = *format++; while (*format != ']')
*subfmtiter++ = *format++; *subfmtiter++ = *format++;
*subfmtiter++ = *format++;
} }
else *subfmtiter++ = *format++; else
*subfmtiter++ = *format++;
*subfmtiter++ = '%'; *subfmtiter++ = '%';
*subfmtiter++ = 'n'; *subfmtiter++ = 'n';
*subfmtiter++ = '\0'; *subfmtiter++ = '\0';
if (sizeof(void*) != sizeof(long*)) abort(); /* all pointers must have the same size */ if (sizeof(void*) != sizeof(long*)) abort(); /* all pointers must have the same size */
if (asterisk) if (asterisk)