RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

options/parse_configfile: use stream_read_file2 for reading config 

Remove the duplication with stream_read_file2, which also handles
directory correctly.
This commit is contained in:
nanahi 2024-10-19 15:27:03 -04:00 committed by Kacper Michajłow
parent 8c3fd2cd38
commit 607997db24
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
options/parse_configfile.c
View File

@ -165,16 +165,11 @@ int m_config_parse_config_file(m_config_t *config, struct mpv_global *global,
int r = 0;
struct stream *s = stream_create(conffile, STREAM_READ | STREAM_ORIGIN_DIRECT,
NULL, global);
if (!s)
goto done;
bstr data = stream_read_complete(s, s, 1000000000);
if (!data.start)
goto done;
r = m_config_parse(config, conffile, data, initial_section, flags);
bstr data = stream_read_file2(conffile, NULL, STREAM_ORIGIN_DIRECT | STREAM_READ,
global, 1000000000);
if (data.start)
r = m_config_parse(config, conffile, data, initial_section, flags);
done:
free_stream(s);
talloc_free(data.start);
return r;
}