mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-05 13:30:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

topology: use snd_config_is_array() function

Browse source 
... instead the own array test.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-05-08 12:04:39 +02:00
parent 0c99c073d3
commit 822f0c443b
1 changed files with 11 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/topology/save.c
View file

@ -102,21 +102,6 @@ static int tplg_pprint_integer(snd_config_t *n, char **ret)
return 0; return 0;
} }
static int tplg_check_array_item(const char *id, int index)
{
const char *p;
long int val;
for (p = id; *p; p++) {
if (*p < '0' || *p > '9')
return 0;
}
errno = 0;
val = strtol(id, NULL, 10);
return errno == 0 && val == index;
}
static int _compar(const void *a, const void *b) static int _compar(const void *a, const void *b)
{ {
const snd_config_t *c1 = *(snd_config_t **)a; const snd_config_t *c1 = *(snd_config_t **)a;
@ -145,24 +130,15 @@ static snd_config_t *sort_config(const char *id, snd_config_t *src)
a = malloc(sizeof(dst) * count); a = malloc(sizeof(dst) * count);
if (a == NULL) if (a == NULL)
return NULL; return NULL;
index = array = 0; array = snd_config_is_array(src);
if (array <= 0) {
index = 0;
snd_config_for_each(i, next, src) { snd_config_for_each(i, next, src) {
snd_config_t *s = snd_config_iterator_entry(i); snd_config_t *s = snd_config_iterator_entry(i);
const char *id2;
a[index++] = s; a[index++] = s;
if (array < 0)
continue;
if (snd_config_get_id(s, &id2)) {
free(a);
return NULL;
} }
if (array >= 0 && tplg_check_array_item(id2, array))
array++;
else
array = -1;
}
if (array < 0)
qsort(a, count, sizeof(a[0]), _compar); qsort(a, count, sizeof(a[0]), _compar);
}
if (snd_config_make_compound(&dst, id, count == 1)) { if (snd_config_make_compound(&dst, id, count == 1)) {
free(a); free(a);
return NULL; return NULL;
@ -329,7 +305,7 @@ retval:
count = 0; count = 0;
quoted = 0; quoted = 0;
array = 0; array = snd_config_is_array(src);
s = NULL; s = NULL;
snd_config_for_each(i, next, src) { snd_config_for_each(i, next, src) {
s = snd_config_iterator_entry(i); s = snd_config_iterator_entry(i);
@ -338,10 +314,6 @@ retval:
return err; return err;
if (!quoted && tplg_check_quoted((unsigned char *)id)) if (!quoted && tplg_check_quoted((unsigned char *)id))
quoted = 1; quoted = 1;
if (array >= 0 && tplg_check_array_item(id, array))
array++;
else
array = -1;
count++; count++;
} }
if (count == 0) if (count == 0)
@ -364,7 +336,7 @@ retval:
if (level > 0) { if (level > 0) {
err = tplg_save_printf(dst, NULL, "%s%s\n", delim, err = tplg_save_printf(dst, NULL, "%s%s\n", delim,
array >= 0 ? "[" : "{"); array > 0 ? "[" : "{");
if (err < 0) if (err < 0)
return err; return err;
} }
@ -378,7 +350,7 @@ retval:
err = tplg_save_printf(dst, pfx, ""); err = tplg_save_printf(dst, pfx, "");
if (err < 0) if (err < 0)
return err; return err;
if (array < 0) { if (array <= 0) {
delim = " "; delim = " ";
if (quoted) { if (quoted) {
err = tplg_save_quoted(dst, id); err = tplg_save_quoted(dst, id);
@ -398,7 +370,7 @@ retval:
if (level > 0) { if (level > 0) {
pfx[level - 1] = '\0'; pfx[level - 1] = '\0';
err = tplg_save_printf(dst, pfx, "%s\n", err = tplg_save_printf(dst, pfx, "%s\n",
array >= 0 ? "]" : "}"); array > 0 ? "]" : "}");
if (err < 0) if (err < 0)
return err; return err;
} }