]> git.alsa-project.org Git - alsa-lib.git/commitdiff
mixer: remove alloca() from elem_write_enum()
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Fri, 15 Jul 2016 00:23:20 +0000 (09:23 +0900)
committerTakashi Iwai <tiwai@suse.de>
Fri, 15 Jul 2016 06:16:33 +0000 (08:16 +0200)
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>
src/mixer/simple_none.c

index 5ae94d98e35ec49b41a46bef71ccc4966d78511a..cf57ea53814e52a2769152e5d9cd949eb7d146d0 100644 (file)
@@ -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;
 }