[11/34] pcm: remove alloca() from _snd_pcm_hook_ctl_elems_install()
diff mbox

Message ID 1468505271-5769-12-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_hooks.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch
diff mbox

diff --git a/src/pcm/pcm_hooks.c b/src/pcm/pcm_hooks.c
index ce1cf36..66e7051 100644
--- a/src/pcm/pcm_hooks.c
+++ b/src/pcm/pcm_hooks.c
@@ -667,7 +667,7 @@  int _snd_pcm_hook_ctl_elems_install(snd_pcm_t *pcm, snd_config_t *conf)
 {
 	int err;
 	int card;
-	snd_pcm_info_t *info;
+	snd_pcm_info_t info = {0};
 	char ctl_name[16];
 	snd_ctl_t *ctl;
 	snd_sctl_t *sctl = NULL;
@@ -675,11 +675,11 @@  int _snd_pcm_hook_ctl_elems_install(snd_pcm_t *pcm, snd_config_t *conf)
 	snd_pcm_hook_t *h_hw_params = NULL, *h_hw_free = NULL, *h_close = NULL;
 	assert(conf);
 	assert(snd_config_get_type(conf) == SND_CONFIG_TYPE_COMPOUND);
-	snd_pcm_info_alloca(&info);
-	err = snd_pcm_info(pcm, info);
+
+	err = snd_pcm_info(pcm, &info);
 	if (err < 0)
 		return err;
-	card = snd_pcm_info_get_card(info);
+	card = snd_pcm_info_get_card(&info);
 	if (card < 0) {
 		SNDERR("No card for this PCM");
 		return -EINVAL;