libretro/libretro-prboom
1
0
Fork 0
mirror of https://github.com/libretro/libretro-prboom.git synced 2025-02-17 05:27:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert M_LoadDefaultsFile() to VFS file I/O

Browse Source
This commit is contained in:
jdgleaver 2021-09-21 15:07:28 +01:00
parent af27eb26ef
commit 30dc265749
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretro/libretro-common/include/streams/file_stream.h
View File

@ -81,7 +81,7 @@ char* filestream_gets(RFILE *stream, char *s, size_t len);
int filestream_getc(RFILE *stream);
int filestream_scanf(RFILE *stream, const char* format, ...);
int filestream_vscanf(RFILE *stream, const char* format, va_list *args);
int filestream_eof(RFILE *stream);

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

@ -221,11 +221,11 @@ int filestream_getc(RFILE *stream)
return EOF;
}
int filestream_scanf(RFILE *stream, const char* format, ...)
int filestream_vscanf(RFILE *stream, const char* format, va_list *args)
{
char buf[4096];
char subfmt[64];
va_list args;
va_list args_copy;
const char * bufiter = buf;
int ret = 0;
int64_t startpos = filestream_tell(stream);
@ -236,7 +236,12 @@ int filestream_scanf(RFILE *stream, const char* format, ...)
buf[maxlen] = '\0';
va_start(args, format);
/* Have to copy the input va_list here
* > Calling va_arg() on 'args' directly would
* cause the va_list to have an indeterminate value
* in the function calling filestream_vscanf(),
* leading to unexpected behaviour */
va_copy(args_copy, *args);
while (*format)
{
@ -302,7 +307,7 @@ int filestream_scanf(RFILE *stream, const char* format, ...)
}
else
{
int v = sscanf(bufiter, subfmt, va_arg(args, void*), &sublen);
int v = sscanf(bufiter, subfmt, va_arg(args_copy, void*), &sublen);
if (v == EOF)
return EOF;
if (v != 1)
@ -327,7 +332,7 @@ int filestream_scanf(RFILE *stream, const char* format, ...)
}
}
va_end(args);
va_end(args_copy);
filestream_seek(stream, startpos+(bufiter-buf),
RETRO_VFS_SEEK_POSITION_START);

2
libretro/libretro-common/streams/file_stream_transforms.c
View File

@ -153,7 +153,7 @@ int rfscanf(RFILE * stream, const char * format, ...)
int result;
va_list vl;
va_start(vl, format);
result = filestream_scanf(stream, format, vl);
result = filestream_vscanf(stream, format, &vl);
va_end(vl);
return result;
}

15
src/m_misc.c
View File

@ -935,22 +935,23 @@ void M_LoadDefaultsFile (char *file, dbool basedefault)
{
int i;
int len;
char def[80];
char strparm[100];
char def[80] = {0};
char strparm[100] = {0};
char* newstring = NULL; // killough
int parm;
dbool isstring;
// read the file in, overriding any set defaults
FILE *f = fopen (file, "r");
RFILE *f = filestream_open (file,
RETRO_VFS_FILE_ACCESS_READ,
RETRO_VFS_FILE_ACCESS_HINT_NONE);
if (f)
{
while (!feof(f))
while (!rfeof(f))
{
isstring = FALSE;
if (fscanf(f, "%79s %99[^\n]\n", def, strparm) == 2)
if (rfscanf(f, "%79s %99[^\n]\n", def, strparm) == 2)
{
//jff 3/3/98 skip lines not starting with an alphanum
if (!isalnum(def[0]))
continue;
@ -1006,7 +1007,7 @@ void M_LoadDefaultsFile (char *file, dbool basedefault)
}
}
}
fclose(f);
filestream_close(f);
}
//jff 3/4/98 redundant range checks for hud deleted here
}