diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2016-07-15 09:23:22 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-07-15 08:16:34 +0200 |
| commit | 2a6af83d73802692d0a8f160efd46a524efd08e8 (patch) | |
| tree | 919e2a639b0b8d238387e429624860fd910a9ffb | |
| parent | 5268e90dbd6ff39dde150c1c339e8cdfd2a2fff2 (diff) | |
| download | alsa-lib-2a6af83d73802692d0a8f160efd46a524efd08e8.tar.gz | |
mixer: remove alloca() from elem_write_route()
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.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index 0ebaf5e8..d0e89632 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -514,19 +514,18 @@ static int elem_write_switch_constant(selem_none_t *s, selem_ctl_type_t type, in static int elem_write_route(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 * c->values; idx++) - snd_ctl_elem_value_set_integer(ctl, idx, 0); + snd_ctl_elem_value_set_integer(&ctl, idx, 0); for (idx = 0; idx < c->values; idx++) - snd_ctl_elem_value_set_integer(ctl, idx * c->values + idx, + snd_ctl_elem_value_set_integer(&ctl, idx * c->values + idx, !!(s->str[dir].sw & (1 << 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; } |