mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ucm: parse_verb_file() - remove folder_name variable and extra logic

Browse source 
The member uc_mgr->conf_file_name already contains the used directory
name.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-11-02 08:57:51 +01:00
parent e61913f94c
commit 6598e38856
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ucm/parser.c
View file

@ -1054,7 +1054,6 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,
char filename[MAX_FILE]; char filename[MAX_FILE];
char *env = getenv(ALSA_CONFIG_UCM_VAR); char *env = getenv(ALSA_CONFIG_UCM_VAR);
int err; int err;
char *folder_name;
/* allocate verb */ /* allocate verb */
verb = calloc(1, sizeof(struct use_case_verb)); verb = calloc(1, sizeof(struct use_case_verb));
@ -1081,17 +1080,12 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,
} }
/* open Verb file for reading */ /* open Verb file for reading */
if (!strncmp(uc_mgr->conf_file_name, uc_mgr->card_long_name, MAX_CARD_LONG_NAME))
folder_name = uc_mgr->card_long_name;
else
folder_name = uc_mgr->card_name;
if (env) if (env)
snprintf(filename, sizeof(filename), "%s/%s/%s", snprintf(filename, sizeof(filename), "%s/%s/%s",
env, folder_name, file); env, uc_mgr->conf_file_name, file);
else else
snprintf(filename, sizeof(filename), "%s/ucm/%s/%s", snprintf(filename, sizeof(filename), "%s/ucm/%s/%s",
snd_config_topdir(), folder_name, file); snd_config_topdir(), uc_mgr->conf_file_name, file);
filename[sizeof(filename)-1] = '\0'; filename[sizeof(filename)-1] = '\0';
err = uc_mgr_config_load(filename, &cfg); err = uc_mgr_config_load(filename, &cfg);