@@ -532,7 +532,7 @@ static int elem_write_route(selem_none_t *s, int dir, selem_ctl_type_t type)
static int elem_write_enum(selem_none_t *s)
{
- snd_ctl_elem_value_t *ctl;
+ snd_ctl_elem_value_t ctl = {0};
unsigned int idx;
int err;
int type;
@@ -546,13 +546,12 @@ static int elem_write_enum(selem_none_t *s)
else if (s->selem.caps & SM_CAP_CENUM)
type = CTL_CAPTURE_ENUM;
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_enumerated(ctl, idx,
+ snd_ctl_elem_value_set_enumerated(&ctl, idx,
(unsigned int)s->str[0].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;
}
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> --- src/mixer/simple_none.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)