summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2016-07-15 09:23:13 +0900
committerTakashi Iwai <tiwai@suse.de>2016-07-15 08:16:32 +0200
commit7ada2d6f41155f542438f78903ee62b0a76cc931 (patch)
treef18c44388a76093fe9a30e58468f2f0e1109a711
parent8d45e412b5ba34b90106f060258027f48dcff155 (diff)
downloadalsa-lib-7ada2d6f41155f542438f78903ee62b0a76cc931.tar.gz
mixer: remove alloca() from selem_read()
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.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
index 39be2d1e..b32bd813 100644
--- a/src/mixer/simple_none.c
+++ b/src/mixer/simple_none.c
@@ -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);
}