]> git.alsa-project.org Git - alsa-lib.git/commitdiff
mixer: remove alloca() from elem_read_route()
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Fri, 15 Jul 2016 00:23:09 +0000 (09:23 +0900)
committerTakashi Iwai <tiwai@suse.de>
Fri, 15 Jul 2016 06:16:31 +0000 (08:16 +0200)
Both of alloca() and automatic variables keep storages on stack, while
the former generates more instructions than the latter. It's better to use
the latter if the size of storage is computable at pre-compile or compile
time; i.e. just for structures.

This commit obsolete usages of alloca() with automatic variables.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
src/mixer/simple_none.c

index 65b7b7b24fe7d3afb3d77f2793d888f2a18c3663..c3ce427254bde197abe1535f1fae43281f051fd8 100644 (file)
@@ -271,18 +271,17 @@ static int elem_read_switch(selem_none_t *s, int dir, selem_ctl_type_t type)
 
 static int elem_read_route(selem_none_t *s, int dir, selem_ctl_type_t type)
 {
-       snd_ctl_elem_value_t *ctl;
+       snd_ctl_elem_value_t ctl = {0};
        unsigned int idx;
        int err;
        selem_ctl_t *c = &s->ctls[type];
-       snd_ctl_elem_value_alloca(&ctl);
-       if ((err = snd_hctl_elem_read(c->elem, ctl)) < 0)
+       if ((err = snd_hctl_elem_read(c->elem, &ctl)) < 0)
                return err;
        for (idx = 0; idx < s->str[dir].channels; idx++) {
                unsigned int idx1 = idx;
                if (idx >= c->values)
                        idx1 = 0;
-               if (!snd_ctl_elem_value_get_integer(ctl,
+               if (!snd_ctl_elem_value_get_integer(&ctl,
                                                    idx1 * c->values + idx1))
                        s->str[dir].sw &= ~(1 << idx);
        }