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

conf.c: rename 'leaf' to 'child'

Browse source 
Nodes that (might) have children are not leaves.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
Clemens Ladisch 2009-07-17 12:41:17 +02:00
parent 9bf79f43c5
commit 9258e8c851
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/conf.c
View file

@ -1324,10 +1324,11 @@ static void string_print(char *str, int id, snd_output_t *out)
snd_output_putc(out, '\''); snd_output_putc(out, '\'');
} }
static int _snd_config_save_leaves(snd_config_t *config, snd_output_t *out, unsigned int level, unsigned int joins); static int _snd_config_save_children(snd_config_t *config, snd_output_t *out,
unsigned int level, unsigned int joins);
static int _snd_config_save_leaf(snd_config_t *n, snd_output_t *out, static int _snd_config_save_node_value(snd_config_t *n, snd_output_t *out,
unsigned int level) unsigned int level)
{ {
int err; int err;
unsigned int k; unsigned int k;
@ -1350,7 +1351,7 @@ static int _snd_config_save_leaf(snd_config_t *n, snd_output_t *out,
case SND_CONFIG_TYPE_COMPOUND: case SND_CONFIG_TYPE_COMPOUND:
snd_output_putc(out, '{'); snd_output_putc(out, '{');
snd_output_putc(out, '\n'); snd_output_putc(out, '\n');
err = _snd_config_save_leaves(n, out, level + 1, 0); err = _snd_config_save_children(n, out, level + 1, 0);
if (err < 0) if (err < 0)
return err; return err;
for (k = 0; k < level; ++k) { for (k = 0; k < level; ++k) {
@ -1372,7 +1373,8 @@ static void id_print(snd_config_t *n, snd_output_t *out, unsigned int joins)
string_print(n->id, 1, out); string_print(n->id, 1, out);
} }
static int _snd_config_save_leaves(snd_config_t *config, snd_output_t *out, unsigned int level, unsigned int joins) static int _snd_config_save_children(snd_config_t *config, snd_output_t *out,
unsigned int level, unsigned int joins)
{ {
unsigned int k; unsigned int k;
int err; int err;
@ -1382,7 +1384,7 @@ static int _snd_config_save_leaves(snd_config_t *config, snd_output_t *out, unsi
snd_config_t *n = snd_config_iterator_entry(i); snd_config_t *n = snd_config_iterator_entry(i);
if (n->type == SND_CONFIG_TYPE_COMPOUND && if (n->type == SND_CONFIG_TYPE_COMPOUND &&
n->u.compound.join) { n->u.compound.join) {
err = _snd_config_save_leaves(n, out, level, joins + 1); err = _snd_config_save_children(n, out, level, joins + 1);
if (err < 0) if (err < 0)
return err; return err;
continue; continue;
@ -1396,7 +1398,7 @@ static int _snd_config_save_leaves(snd_config_t *config, snd_output_t *out, unsi
snd_output_putc(out, '='); snd_output_putc(out, '=');
#endif #endif
snd_output_putc(out, ' '); snd_output_putc(out, ' ');
err = _snd_config_save_leaf(n, out, level); err = _snd_config_save_node_value(n, out, level);
if (err < 0) if (err < 0)
return err; return err;
#if 0 #if 0
@ -1642,22 +1644,22 @@ int snd_config_load_override(snd_config_t *config, snd_input_t *in)
/** /**
* \brief Adds a child to a compound configuration node. * \brief Adds a child to a compound configuration node.
* \param parent Handle to the compound configuration node. * \param parent Handle to the compound configuration node.
* \param leaf Handle to the configuration node to be added to \p parent. * \param child Handle to the configuration node to be added to \p parent.
* \return Zero if successful, otherwise a negative error code. * \return Zero if successful, otherwise a negative error code.
*/ */
int snd_config_add(snd_config_t *parent, snd_config_t *leaf) int snd_config_add(snd_config_t *parent, snd_config_t *child)
{ {
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
assert(parent && leaf); assert(parent && child);
if (!leaf->id || leaf->parent) if (!child->id || child->parent)
return -EINVAL; return -EINVAL;
snd_config_for_each(i, next, parent) { snd_config_for_each(i, next, parent) {
snd_config_t *n = snd_config_iterator_entry(i); snd_config_t *n = snd_config_iterator_entry(i);
if (strcmp(leaf->id, n->id) == 0) if (strcmp(child->id, n->id) == 0)
return -EEXIST; return -EEXIST;
} }
leaf->parent = parent; child->parent = parent;
list_add_tail(&leaf->list, &parent->u.compound.fields); list_add_tail(&child->list, &parent->u.compound.fields);
return 0; return 0;
} }
@ -1697,8 +1699,8 @@ int snd_config_delete(snd_config_t *config)
i = config->u.compound.fields.next; i = config->u.compound.fields.next;
while (i != &config->u.compound.fields) { while (i != &config->u.compound.fields) {
struct list_head *nexti = i->next; struct list_head *nexti = i->next;
snd_config_t *leaf = snd_config_iterator_entry(i); snd_config_t *child = snd_config_iterator_entry(i);
err = snd_config_delete(leaf); err = snd_config_delete(child);
if (err < 0) if (err < 0)
return err; return err;
i = nexti; i = nexti;
@ -1736,8 +1738,8 @@ int snd_config_delete_compound_members(const snd_config_t *config)
i = config->u.compound.fields.next; i = config->u.compound.fields.next;
while (i != &config->u.compound.fields) { while (i != &config->u.compound.fields) {
struct list_head *nexti = i->next; struct list_head *nexti = i->next;
snd_config_t *leaf = snd_config_iterator_entry(i); snd_config_t *child = snd_config_iterator_entry(i);
err = snd_config_delete(leaf); err = snd_config_delete(child);
if (err < 0) if (err < 0)
return err; return err;
i = nexti; i = nexti;
@ -2315,9 +2317,9 @@ int snd_config_save(snd_config_t *config, snd_output_t *out)
{ {
assert(config && out); assert(config && out);
if (config->type == SND_CONFIG_TYPE_COMPOUND) if (config->type == SND_CONFIG_TYPE_COMPOUND)
return _snd_config_save_leaves(config, out, 0, 0); return _snd_config_save_children(config, out, 0, 0);
else else
return _snd_config_save_leaf(config, out, 0); return _snd_config_save_node_value(config, out, 0);
} }
/* /*