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

ucm: shuffle code in compound_merge()

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-06-02 19:11:22 +02:00
parent becb402165
commit f60e0d5fdc
1 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/ucm/ucm_include.c
View file

@ -91,13 +91,29 @@ static void config_dump(snd_config_t *cfg)
} }
#endif #endif
static int find_position_node(snd_config_t **res, snd_config_t *dst,
const char *id, snd_config_t *pos)
{
const char *s;
int err;
err = get_string(pos, id, &s);
if (err < 0 && err != -ENOENT)
return err;
if (err == 0) {
err = snd_config_search(dst, s, res);
if (err < 0 && err != -ENOENT)
return err;
}
return 0;
}
static int compound_merge(const char *id, static int compound_merge(const char *id,
snd_config_t *dst, snd_config_t *src, snd_config_t *dst, snd_config_t *src,
snd_config_t *before, snd_config_t *after) snd_config_t *before, snd_config_t *after)
{ {
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
snd_config_t *n, *_before = NULL, *_after = NULL; snd_config_t *n, *_before = NULL, *_after = NULL;
const char *s;
char tmpid[32]; char tmpid[32];
int err, array, idx; int err, array, idx;
@ -107,24 +123,14 @@ static int compound_merge(const char *id,
} }
if (before) { if (before) {
err = get_string(before, id, &s); err = find_position_node(&_before, dst, id, before);
if (err < 0 && err != -ENOENT) if (err < 0)
return err; return err;
if (err == 0) {
err = snd_config_search(dst, s, &_before);
if (err < 0 && err != -ENOENT)
return err;
}
} }
if (after) { if (after) {
err = get_string(after, id, &s); err = find_position_node(&_after, dst, id, after);
if (err < 0 && err != -ENOENT) if (err < 0)
return err; return err;
if (err == 0) {
err = snd_config_search(dst, s, &_after);
if (err < 0 && err != -ENOENT)
return err;
}
} }
if (_before && _after) { if (_before && _after) {