From f453d783336167ee2714573f4352a72e3ce65094 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 12 Jun 2026 13:55:24 +0200 Subject: [PATCH] ucm: move optional file trace into uc_mgr_config_load_into Do not duplicate traces and identify correctly the optional include in first hit. Signed-off-by: Jaroslav Kysela --- src/ucm/ucm_include.c | 4 +--- src/ucm/utils.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ucm/ucm_include.c b/src/ucm/ucm_include.c index d663ffc1..1d2558b3 100644 --- a/src/ucm/ucm_include.c +++ b/src/ucm/ucm_include.c @@ -91,10 +91,8 @@ static int include_eval_one(snd_use_case_mgr_t *uc_mgr, if (err < 0) return err; err = uc_mgr_config_load_file(uc_mgr, s, result, opt_bool); - if (opt_bool && (err == -ENOENT || err == -EACCES)) { - snd_trace(UCM, "optional file '%s' not found or readable", s); + if (opt_bool && (err == -ENOENT || err == -EACCES)) err = 0; - } free(s); return err; } diff --git a/src/ucm/utils.c b/src/ucm/utils.c index 011bdab3..c386593b 100644 --- a/src/ucm/utils.c +++ b/src/ucm/utils.c @@ -372,7 +372,7 @@ int uc_mgr_config_load_into(int format, const char *file, snd_config_t *top, boo if (!optional || (err != -ENOENT && err != -EACCES)) snd_error(UCM, "could not open configuration file %s", file); else - snd_trace(UCM, "could not open configuration file %s", file); + snd_trace(UCM, "optional configuration file %s not found or readable", file); return err; } err = snd_input_stdio_attach(&in, fp, 1); -- 2.52.0