aniani/ezstream
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-06-09 06:10:42 +00:00
Code

Rename config file (re)load function for clarity

Browse Source
This commit is contained in:
Moritz Grimm 2016-10-14 16:19:39 +02:00
parent 8344c458de
commit cce2455bc6
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cfg.c
View File

@ -157,7 +157,7 @@ cfg_clear(void)
}
int
cfg_reload(void)
cfg_file_reload(void)
{
cfg_save();
if (0 > _cfg_load()) {

2
src/cfg.h
View File

@ -79,7 +79,7 @@ void cfg_clear(void);
int cfg_check(const char **);
int cfg_reload(void);
int cfg_file_reload(void);
int cfg_stream_str2fmt(const char *, enum cfg_stream_format *);
const char *

2
src/ezstream.c
View File

@ -780,7 +780,7 @@ main(int argc, char *argv[])
0 > cfg_decoder_init() ||
0 > cfg_encoder_init() ||
0 > playlist_init() ||
0 > cfg_reload() ||
0 > cfg_file_reload() ||
0 > stream_init())
return (ez_shutdown(ret));

18
tests/check_cfg_xmlfile.c
View File

@ -11,29 +11,29 @@ START_TEST(test_reload)
{
ck_assert_int_eq(cfg_set_program_config_file(EXAMPLESDIR "/ezstream-file_template.xml",
NULL), 0);
ck_assert_int_eq(cfg_reload(), 0);
ck_assert_int_eq(cfg_file_reload(), 0);
ck_assert_int_eq(cfg_set_program_config_file(EXAMPLESDIR "/ezstream-full.xml",
NULL), 0);
ck_assert_int_eq(cfg_reload(), 0);
ck_assert_int_eq(cfg_file_reload(), 0);
ck_assert_int_eq(cfg_set_program_config_file(EXAMPLESDIR "/ezstream-minimal.xml",
NULL), 0);
ck_assert_int_eq(cfg_reload(), 0);
ck_assert_int_eq(cfg_file_reload(), 0);
ck_assert_int_eq(cfg_set_program_config_file(EXAMPLESDIR "/ezstream-video.xml",
NULL), 0);
ck_assert_int_eq(cfg_reload(), 0);
ck_assert_int_eq(cfg_reload(), 0);
ck_assert_int_eq(cfg_file_reload(), 0);
ck_assert_int_eq(cfg_file_reload(), 0);
ck_assert_int_eq(cfg_set_program_config_file(SRCDIR "/config-bad.xml",
NULL), 0);
ck_assert_int_eq(cfg_reload(), -1);
ck_assert_int_eq(cfg_file_reload(), -1);
ck_assert_int_eq(cfg_set_program_config_file(SRCDIR "/config-bad2.xml",
NULL), 0);
ck_assert_int_eq(cfg_reload(), -1);
ck_assert_int_eq(cfg_file_reload(), -1);
ck_assert_int_eq(cfg_set_program_config_file(SRCDIR "/config-bad3.xml",
NULL), 0);
ck_assert_int_eq(cfg_reload(), -1);
ck_assert_int_eq(cfg_file_reload(), -1);
ck_assert_int_eq(cfg_set_program_config_file(SRCDIR "/config-bad4.xml",
NULL), 0);
ck_assert_int_eq(cfg_reload(), -1);
ck_assert_int_eq(cfg_file_reload(), -1);
}
END_TEST