From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 18 May 2022 06:45:33 +0000 (+0200)
Subject: ucm: move macros and evali substitution to Syntax 6
X-Git-Tag: v1.2.7~29
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=b45fbeee34f61d08f204bec51f2d0ed269543b68;p=alsa-lib.git

ucm: move macros and evali substitution to Syntax 6

There should be printed an error when the new configuration
blocks are used with the older alsa-lib.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index 71b95f0e..7e4e4ced 100644
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -367,8 +367,8 @@ static int evaluate_define_macro(snd_use_case_mgr_t *uc_mgr,
 		return -EINVAL;
 	}
 
-	if (uc_mgr->conf_format < 5) {
-		uc_error("DefineMacro is supported in v5+ syntax");
+	if (uc_mgr->conf_format < 6) {
+		uc_error("DefineMacro is supported in v6+ syntax");
 		return -EINVAL;
 	}
 
@@ -481,8 +481,8 @@ static int evaluate_macro(snd_use_case_mgr_t *uc_mgr,
 		return -EINVAL;
 	}
 
-	if (uc_mgr->conf_format < 5) {
-		uc_error("Macro is supported in v5+ syntax");
+	if (uc_mgr->conf_format < 6) {
+		uc_error("Macro is supported in v6+ syntax");
 		return -EINVAL;
 	}
 
diff --git a/src/ucm/ucm_subs.c b/src/ucm/ucm_subs.c
index 7bf0aaae..6ff21853 100644
--- a/src/ucm/ucm_subs.c
+++ b/src/ucm/ucm_subs.c
@@ -614,8 +614,8 @@ static int rval_evali(snd_use_case_mgr_t *uc_mgr, snd_config_t *node, const char
 	size_t l;
 	int err;
 
-	if (uc_mgr->conf_format < 5) {
-		uc_error("variable evaluation is supported in v5+ syntax");
+	if (uc_mgr->conf_format < 6) {
+		uc_error("variable evaluation is supported in v6+ syntax");
 		return -EINVAL;
 	}
 	err = snd_config_get_id(node, &id);