]> git.alsa-project.org Git - alsa-lib.git/commitdiff
mixer: remove alloca() from elem_write_volume()
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Fri, 15 Jul 2016 00:23:15 +0000 (09:23 +0900)
committerTakashi Iwai <tiwai@suse.de>
Fri, 15 Jul 2016 06:16:32 +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 2ae4b0aa4450bb2d5541bd34fd220e84ff6d6e51..ee9f84a95027e3042bfc2139694d7066a3f28904 100644 (file)
@@ -467,17 +467,16 @@ static int selem_read(snd_mixer_elem_t *elem)
 
 static int elem_write_volume(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 < c->values; idx++)
-               snd_ctl_elem_value_set_integer(ctl, idx,
+               snd_ctl_elem_value_set_integer(&ctl, idx,
                                from_user(s, dir, c, s->str[dir].vol[idx]));
-       if ((err = snd_hctl_elem_write(c->elem, ctl)) < 0)
+       if ((err = snd_hctl_elem_write(c->elem, &ctl)) < 0)
                return err;
        return 0;
 }