From: Takashi Sakamoto Date: Fri, 15 Jul 2016 00:23:24 +0000 (+0900) Subject: mixer: remove alloca() from selem_write_main() X-Git-Tag: v1.1.2~23 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=60920eb7f37b1bca4a9c96247796da108ab275b5;p=alsa-lib.git mixer: remove alloca() from selem_write_main() 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 Signed-off-by: Takashi Iwai --- diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index 10b878e6..4bd231ca 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -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);