]> git.alsa-project.org Git - alsa-lib.git/commitdiff
mixer: remove alloca() from get_enum_item_ops()
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Fri, 15 Jul 2016 00:23:28 +0000 (09:23 +0900)
committerTakashi Iwai <tiwai@suse.de>
Fri, 15 Jul 2016 06:16:35 +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 ab2b1515147c4798204edb76f8d7af5dec369bb3..3362f8268ef15fd49af66d5625271bd58a2f29a3 100644 (file)
@@ -1342,7 +1342,7 @@ static int get_enum_item_ops(snd_mixer_elem_t *elem,
                             unsigned int *itemp)
 {
        selem_none_t *s = snd_mixer_elem_get_private(elem);
-       snd_ctl_elem_value_t *ctl;
+       snd_ctl_elem_value_t ctl = {0};
        snd_hctl_elem_t *helem;
        int err;
 
@@ -1352,10 +1352,9 @@ static int get_enum_item_ops(snd_mixer_elem_t *elem,
        if (!helem) helem = s->ctls[CTL_PLAYBACK_ENUM].elem;
        if (!helem) helem = s->ctls[CTL_CAPTURE_ENUM].elem;
        assert(helem);
-       snd_ctl_elem_value_alloca(&ctl);
-       err = snd_hctl_elem_read(helem, ctl);
+       err = snd_hctl_elem_read(helem, &ctl);
        if (! err)
-               *itemp = snd_ctl_elem_value_get_enumerated(ctl, channel);
+               *itemp = snd_ctl_elem_value_get_enumerated(&ctl, channel);
        return err;
 }