mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-26 07:57:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: refine check for snd_config_is_array

Browse source 
Apart from checking the index, also check if the
node is not compound to qualify a config as an array.

For ex:

mixer [
	"mixer1"
]

is an array but

mixer.0 {
	name	"mixer 1"
}

is not an array even though the id is 0.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2021-06-15 14:25:30 -07:00
parent 81e7923fbf
commit 971cd4eaaf
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/conf.c
View file

@ -1796,17 +1796,20 @@ snd_config_type_t snd_config_get_type(const snd_config_t *config)
return config->type; return config->type;
} }
static int check_array_item(const char *id, int index) static int check_array_item(const snd_config_t *config, int index)
{ {
const char *p; const char *p;
long val; long val;
for (p = id; *p; p++) { if (config->type == SND_CONFIG_TYPE_COMPOUND)
return 0;
for (p = config->id; *p; p++) {
if (*p < '0' || *p > '9') if (*p < '0' || *p > '9')
return 0; return 0;
} }
if (safe_strtol(id, &val)) if (safe_strtol(config->id, &val))
return 0; return 0;
return val == index; return val == index;
} }
@ -1829,7 +1832,7 @@ int snd_config_is_array(const snd_config_t *config)
idx = 0; idx = 0;
snd_config_for_each(i, next, config) { snd_config_for_each(i, next, config) {
node = snd_config_iterator_entry(i); node = snd_config_iterator_entry(i);
if (!check_array_item(node->id, idx)) if (!check_array_item(node, idx))
return 0; return 0;
idx++; idx++;
} }