]> git.alsa-project.org Git - alsa-lib.git/commitdiff
mixer: remove alloca() from selem_read()
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Fri, 15 Jul 2016 00:23:13 +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 39be2d1e2e3795bccde399e463e94e33b87f14c9..b32bd81337250afd252573e371765b5bd081ea05 100644 (file)
@@ -441,17 +441,16 @@ static int selem_read(snd_mixer_elem_t *elem)
                        return err;
        }
        if (s->ctls[CTL_CAPTURE_SOURCE].elem) {
-               snd_ctl_elem_value_t *ctl;
+               snd_ctl_elem_value_t ctl = {0};
                selem_ctl_t *c = &s->ctls[CTL_CAPTURE_SOURCE];
-               snd_ctl_elem_value_alloca(&ctl);
-               err = snd_hctl_elem_read(c->elem, ctl);
+               err = snd_hctl_elem_read(c->elem, &ctl);
                if (err < 0)
                        return err;
                for (idx = 0; idx < s->str[SM_CAPT].channels; idx++) {
                        unsigned int idx1 = idx;
                        if (idx >= c->values)
                                idx1 = 0;
-                       if (snd_ctl_elem_value_get_enumerated(ctl, idx1) !=
+                       if (snd_ctl_elem_value_get_enumerated(&ctl, idx1) !=
                                                                s->capture_item)
                                s->str[SM_CAPT].sw &= ~(1 << idx);
                }