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

conf: improve the include paths code

Browse source 
- various cleanups (more straight code and allocations)
- do not add the base config path /usr/share/alsa to the
  explicit include list of directories
  (it's not wanted for ucm configs)

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-11-10 13:00:59 +01:00
parent 6598e38856
commit f600310954
3 changed files with 46 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/ucm/utils.c
View file

@ -54,7 +54,7 @@ int uc_mgr_config_load(const char *file, snd_config_t **cfg)
FILE *fp;
snd_input_t *in;
snd_config_t *top;
char *default_path;
const char *path, *default_paths[2];
int err;
fp = fopen(file, "r");
@ -71,15 +71,13 @@ int uc_mgr_config_load(const char *file, snd_config_t **cfg)
if (err < 0)
goto __err1;
default_path = getenv(ALSA_CONFIG_UCM_VAR);
if (!default_path || !*default_path)
default_path = ALSA_CONFIG_DIR "/ucm";
default_path = strdup(default_path);
if (!default_path) {
err = -ENOMEM;
goto __err2;
}
err = _snd_config_load_with_include(top, in, 0, default_path);
path = getenv(ALSA_CONFIG_UCM_VAR);
if (!path || path[0] == '\0')
path = ALSA_CONFIG_DIR "/ucm";
default_paths[0] = path;
default_paths[1] = NULL;
err = _snd_config_load_with_include(top, in, 0, default_paths);
if (err < 0) {
uc_error("could not load configuration file %s", file);
goto __err2;