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

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

39
src/conf.c
View file

@ -1832,16 +1832,19 @@ int snd_config_top(snd_config_t **config)
return _snd_config_make(config, 0, SND_CONFIG_TYPE_COMPOUND);
}
static int snd_config_load1(snd_config_t *config, snd_input_t *in, int override,
char *default_include_path)
#ifndef DOC_HIDDEN
int _snd_config_load_with_include(snd_config_t *config, snd_input_t *in,
int override, char *default_include_path)
{
int err;
input_t input;
struct filedesc *fd, *fd_next;
assert(config && in);
fd = malloc(sizeof(*fd));
if (!fd)
return -ENOMEM;
if (!fd) {
err = -ENOMEM;
goto _end_inc;
}
fd->name = NULL;
fd->in = in;
fd->line = 1;
@ -1852,6 +1855,7 @@ static int snd_config_load1(snd_config_t *config, snd_input_t *in, int override,
err = add_include_path(fd, default_include_path);
if (err < 0)
goto _end;
default_include_path = NULL;
}
input.current = fd;
input.unget = 0;
@ -1900,8 +1904,11 @@ static int snd_config_load1(snd_config_t *config, snd_input_t *in, int override,
free_include_paths(fd);
free(fd);
_end_inc:
free(default_include_path);
return err;
}
#endif
/**
* \brief Loads a configuration tree.
@ -1921,29 +1928,9 @@ static int snd_config_load1(snd_config_t *config, snd_input_t *in, int override,
*/
int snd_config_load(snd_config_t *config, snd_input_t *in)
{
return snd_config_load1(config, in, 0, NULL);
return _snd_config_load_with_include(config, in, 0, NULL);
}
#ifndef DOC_HIDDEN
/* load config with the default include path; used internally for UCM parser */
int _snd_config_load_with_include(snd_config_t *config, snd_input_t *in,
const char *default_include_path)
{
int err;
char *s = NULL;
if (default_include_path) {
s = strdup(default_include_path);
if (!s)
return -ENOMEM;
}
err = snd_config_load1(config, in, 0, s);
if (err < 0)
free(s);
return err;
}
#endif
/**
* \brief Loads a configuration tree and overrides existing configuration nodes.
* \param config Handle to a top level configuration node.
@ -1956,7 +1943,7 @@ int _snd_config_load_with_include(snd_config_t *config, snd_input_t *in,
*/
int snd_config_load_override(snd_config_t *config, snd_input_t *in)
{
return snd_config_load1(config, in, 1, NULL);
return _snd_config_load_with_include(config, in, 1, NULL);
}
/**