From 2b217b7010b7d57848db9c01eb57b5535c332af2 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 6 Oct 2020 10:47:11 +0200 Subject: [PATCH] ucm: rename once_list to boot_list Signed-off-by: Jaroslav Kysela --- src/ucm/main.c | 8 ++++---- src/ucm/parser.c | 6 +++--- src/ucm/ucm_local.h | 2 +- src/ucm/utils.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ucm/main.c b/src/ucm/main.c index 00b41708..49865df8 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -577,7 +577,7 @@ static int check_empty_configuration(snd_use_case_mgr_t *uc_mgr) { if (!list_empty(&uc_mgr->verb_list)) return 0; - if (!list_empty(&uc_mgr->once_list)) + if (!list_empty(&uc_mgr->boot_list)) return 0; return -ENXIO; } @@ -976,7 +976,7 @@ int snd_use_case_mgr_open(snd_use_case_mgr_t **uc_mgr, if (mgr == NULL) return -ENOMEM; INIT_LIST_HEAD(&mgr->verb_list); - INIT_LIST_HEAD(&mgr->once_list); + INIT_LIST_HEAD(&mgr->boot_list); INIT_LIST_HEAD(&mgr->default_list); INIT_LIST_HEAD(&mgr->value_list); INIT_LIST_HEAD(&mgr->active_modifiers); @@ -1878,10 +1878,10 @@ static int set_boot_user(snd_use_case_mgr_t *uc_mgr, uc_error("error: wrong value for _boot (%s)", value); return -EINVAL; } - err = execute_sequence(uc_mgr, &uc_mgr->once_list, + err = execute_sequence(uc_mgr, &uc_mgr->boot_list, &uc_mgr->value_list, NULL, NULL); if (err < 0) { - uc_error("Unable to execute once sequence"); + uc_error("Unable to execute boot sequence"); return err; } return err; diff --git a/src/ucm/parser.c b/src/ucm/parser.c index 8af232d2..75b78826 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -1746,11 +1746,11 @@ static int parse_controls_boot(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg) { int err; - if (!list_empty(&uc_mgr->once_list)) { - uc_error("Once list is not empty"); + if (!list_empty(&uc_mgr->boot_list)) { + uc_error("Boot list is not empty"); return -EINVAL; } - err = parse_sequence(uc_mgr, &uc_mgr->once_list, cfg); + err = parse_sequence(uc_mgr, &uc_mgr->boot_list, cfg); if (err < 0) { uc_error("Unable to parse BootSequence"); return err; diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h index dd72e3f5..e564e839 100644 --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h @@ -223,7 +223,7 @@ struct snd_use_case_mgr { struct list_head verb_list; /* boot settings - sequence */ - struct list_head once_list; + struct list_head boot_list; /* default settings - sequence */ struct list_head default_list; diff --git a/src/ucm/utils.c b/src/ucm/utils.c index fbced51a..df6fd4de 100644 --- a/src/ucm/utils.c +++ b/src/ucm/utils.c @@ -681,7 +681,7 @@ void uc_mgr_free_verb(snd_use_case_mgr_t *uc_mgr) list_del(&verb->list); free(verb); } - uc_mgr_free_sequence(&uc_mgr->once_list); + uc_mgr_free_sequence(&uc_mgr->boot_list); uc_mgr_free_sequence(&uc_mgr->default_list); uc_mgr_free_value(&uc_mgr->value_list); uc_mgr_free_value(&uc_mgr->variable_list); -- 2.47.1