[14/34] pcm: remove alloca() from snd_pcm_query_chmaps_from_hw()
diff mbox

Message ID 1468505271-5769-15-git-send-email-o-takashi@sakamocchi.jp
State New
Headers show

Commit Message

Takashi Sakamoto July 14, 2016, 2:07 p.m. UTC
Both of alloca() and automatic variables keeps 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/pcm/pcm_hw.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Patch
diff mbox

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index 864d5fa..e7a2393 100644
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -1094,7 +1094,7 @@  snd_pcm_query_chmaps_from_hw(int card, int dev, int subdev,
 			     snd_pcm_stream_t stream)
 {
 	snd_ctl_t *ctl;
-	snd_ctl_elem_id_t *id;
+	snd_ctl_elem_id_t id = {0};
 	unsigned int tlv[2048], *start;
 	snd_pcm_chmap_query_t **map;
 	int i, ret, nums;
@@ -1105,9 +1105,8 @@  snd_pcm_query_chmaps_from_hw(int card, int dev, int subdev,
 		return NULL;
 	}
 
-	snd_ctl_elem_id_alloca(&id);
-	__fill_chmap_ctl_id(id, dev, subdev, stream);
-	ret = snd_ctl_elem_tlv_read(ctl, id, tlv, sizeof(tlv));
+	__fill_chmap_ctl_id(&id, dev, subdev, stream);
+	ret = snd_ctl_elem_tlv_read(ctl, &id, tlv, sizeof(tlv));
 	snd_ctl_close(ctl);
 	if (ret < 0) {
 		SYSMSG("Cannot read Channel Map TLV\n");