[alsa-devel] [PATCH 09/29] mixer: remove alloca() from selem_read()

Takashi Sakamoto o-takashi at sakamocchi.jp
Fri Jul 15 02:23:13 CEST 2016


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 at sakamocchi.jp>
---
 src/mixer/simple_none.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
index 39be2d1..b32bd81 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);
 		}
-- 
2.7.4



More information about the Alsa-devel mailing list