From 6598e388567fa00f19e90ec91ecdf23a9f2b2c2b Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sat, 2 Nov 2019 08:57:51 +0100 Subject: [PATCH] ucm: parse_verb_file() - remove folder_name variable and extra logic The member uc_mgr->conf_file_name already contains the used directory name. Signed-off-by: Jaroslav Kysela --- src/ucm/parser.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/ucm/parser.c b/src/ucm/parser.c index 9400e120..d0190b54 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -1054,7 +1054,6 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr, char filename[MAX_FILE]; char *env = getenv(ALSA_CONFIG_UCM_VAR); int err; - char *folder_name; /* allocate 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 */ - 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) snprintf(filename, sizeof(filename), "%s/%s/%s", - env, folder_name, file); + env, uc_mgr->conf_file_name, file); else 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'; err = uc_mgr_config_load(filename, &cfg); -- 2.47.1