summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2016-07-15 09:23:15 +0900
committerTakashi Iwai <tiwai@suse.de>2016-07-15 08:16:32 +0200
commit1c11f334e7707f2d8e1dc95c0549c3c21282911d (patch)
tree2f9aa64854a886ebd0137b4028b0f5a49bee7b52
parent32393c67ab73fc2f039427cb029823a41e7cedec (diff)
downloadalsa-lib-1c11f334e7707f2d8e1dc95c0549c3c21282911d.tar.gz
mixer: remove alloca() from elem_write_volume()
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>
-rw-r--r--src/mixer/simple_none.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
index 2ae4b0aa..ee9f84a9 100644
--- a/src/mixer/simple_none.c
+++ b/src/mixer/simple_none.c
@@ -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;
}