mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-01 22:58:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ucm: macro - make argument names shorter

Browse source 
It seems that the use the macro name as the variable prefix is too large.
Use just two underscores as prefix for the macro arguments to make
macro definitions more readable.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2022-05-19 11:27:37 +02:00
parent 2389f04541
commit 5f0479762b
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ucm/parser.c
View file

@ -419,7 +419,7 @@ static int evaluate_macro1(snd_use_case_mgr_t *uc_mgr,
err = snd_config_get_ascii(n, &var); err = snd_config_get_ascii(n, &var);
if (err < 0) if (err < 0)
return err; return err;
snprintf(name, sizeof(name), "%s_%s", mid, id); snprintf(name, sizeof(name), "__%s", id);
err = uc_mgr_set_variable(uc_mgr, name, var); err = uc_mgr_set_variable(uc_mgr, name, var);
free(var); free(var);
if (err < 0) if (err < 0)
@ -444,7 +444,7 @@ static int evaluate_macro1(snd_use_case_mgr_t *uc_mgr,
err = snd_config_get_id(n, &id); err = snd_config_get_id(n, &id);
if (err < 0) if (err < 0)
return err; return err;
snprintf(name, sizeof(name), "%s_%s", mid, id); snprintf(name, sizeof(name), "__%s", id);
err = uc_mgr_delete_variable(uc_mgr, name); err = uc_mgr_delete_variable(uc_mgr, name);
if (err < 0) if (err < 0)
return err; return err;

12
src/ucm/ucm_confdoc.h
View file

@ -461,16 +461,16 @@ macro like:
~~~{.html} ~~~{.html}
DefineMacro.macro1 { DefineMacro.macro1 {
Define.a "${var:macro1_arg1}" Define.a "${var:__arg1}"
Define.b "${var:macro1_other}" Define.b "${var:__other}"
# Device or any other block may be defined here... # Device or any other block may be defined here...
} }
~~~ ~~~
The arguments in the macro are refered as the variables with the macro The arguments in the macro are refered as the variables with the double
name prefix and underscore (*'_'*) delimiter. The configuration block underscore name prefix (like *__variable*). The configuration block in
in the DefineMacro subtree is always evaluated (including arguments the DefineMacro subtree is always evaluated (including arguments and variables)
and variables) at the time of the instantiation. at the time of the instantiation.
The macros can be instantiated (expanded) using: The macros can be instantiated (expanded) using: