asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-09-20 01:59:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

alsatplg: do not do NULL check for string arrays

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-06-18 10:15:46 +02:00
parent 0b8d2dfdcc
commit f076518254
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
topology/pre-process-object.c
View file

@ -201,35 +201,32 @@ static int tplg_create_config_template(struct tplg_pre_processor *tplg_pp,
return ret; return ret;
/* add integer configs */ /* add integer configs */
if (items->int_config_ids) for (i = 0; i < MAX_CONFIGS_IN_TEMPLATE; i++)
for (i = 0; i < MAX_CONFIGS_IN_TEMPLATE; i++) if (items->int_config_ids[i]) {
if (items->int_config_ids[i]) { ret = tplg_config_make_add(&child, items->int_config_ids[i],
ret = tplg_config_make_add(&child, items->int_config_ids[i], SND_CONFIG_TYPE_INTEGER, top);
SND_CONFIG_TYPE_INTEGER, top); if (ret < 0)
if (ret < 0) goto err;
goto err; }
}
/* add string configs */ /* add string configs */
if (items->string_config_ids) for (i = 0; i < MAX_CONFIGS_IN_TEMPLATE; i++)
for (i = 0; i < MAX_CONFIGS_IN_TEMPLATE; i++) if (items->string_config_ids[i]) {
if (items->string_config_ids[i]) { ret = tplg_config_make_add(&child, items->string_config_ids[i],
ret = tplg_config_make_add(&child, items->string_config_ids[i], SND_CONFIG_TYPE_STRING, top);
SND_CONFIG_TYPE_STRING, top); if (ret < 0)
if (ret < 0) goto err;
goto err; }
}
/* add compound configs */ /* add compound configs */
if (items->compound_config_ids) for (i = 0; i < MAX_CONFIGS_IN_TEMPLATE; i++) {
for (i = 0; i < MAX_CONFIGS_IN_TEMPLATE; i++) { if (items->compound_config_ids[i]) {
if (items->compound_config_ids[i]) { ret = tplg_config_make_add(&child, items->compound_config_ids[i],
ret = tplg_config_make_add(&child, items->compound_config_ids[i], SND_CONFIG_TYPE_COMPOUND, top);
SND_CONFIG_TYPE_COMPOUND, top); if (ret < 0)
if (ret < 0) goto err;
goto err;
}
} }
}
err: err:
if (ret < 0) { if (ret < 0) {