mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

conf: rename snd_conf_load1() to _snd_config_load_with_include()

Browse source 
Always free the include path which must be mallocated by the caller.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-01-07 13:15:32 +01:00
parent f664a7aec9
commit 1e5ecbc806
3 changed files with 29 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/ucm/utils.c
View file

@ -54,17 +54,12 @@ int uc_mgr_config_load(const char *file, snd_config_t **cfg)
FILE *fp;
snd_input_t *in;
snd_config_t *top;
const char *default_path;
char *default_path;
int err;
fp = fopen(file, "r");
if (fp == NULL) {
err = -errno;
goto __err;
}
err = snd_input_stdio_attach(&in, fp, 1);
err = fp == NULL ? -errno : snd_input_stdio_attach(&in, fp, 1);
if (err < 0) {
__err:
uc_error("could not open configuration file %s", file);
return err;
}
@ -75,19 +70,25 @@ int uc_mgr_config_load(const char *file, snd_config_t **cfg)
default_path = getenv(ALSA_CONFIG_UCM_VAR);
if (!default_path || !*default_path)
default_path = ALSA_CONFIG_DIR "/ucm";
err = _snd_config_load_with_include(top, in, default_path);
default_path = strdup(default_path);
if (!default_path) {
err = -ENOMEM;
goto __err2;
}
err = _snd_config_load_with_include(top, in, 0, default_path);
if (err < 0) {
uc_error("could not load configuration file %s", file);
snd_config_delete(top);
return err;
goto __err2;
}
err = snd_input_close(in);
if (err < 0) {
snd_config_delete(top);
return err;
}
if (err < 0)
goto __err2;
*cfg = top;
return 0;
__err2:
snd_config_delete(top);
return err;
}
void uc_mgr_free_value(struct list_head *base)