]> git.alsa-project.org Git - alsa-lib.git/commitdiff
mixer: remove alloca() from selem_write_main()
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Fri, 15 Jul 2016 00:23:24 +0000 (09:23 +0900)
committerTakashi Iwai <tiwai@suse.de>
Fri, 15 Jul 2016 06:16:34 +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 10b878e6a1af8d657d88adeb827f5ca70598cf4f..4bd231ca87a7556079176af0975655136784711e 100644 (file)
@@ -628,17 +628,16 @@ static int selem_write_main(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);
-               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++) {
                        if (s->str[SM_CAPT].sw & (1 << idx))
-                               snd_ctl_elem_value_set_enumerated(ctl,
+                               snd_ctl_elem_value_set_enumerated(&ctl,
                                                        idx, s->capture_item);
                }
-               if ((err = snd_hctl_elem_write(c->elem, ctl)) < 0)
+               if ((err = snd_hctl_elem_write(c->elem, &ctl)) < 0)
                        return err;
                /* update the element, don't remove */
                err = selem_read(elem);