summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2016-07-14 23:07:34 +0900
committerTakashi Iwai <tiwai@suse.de>2016-07-14 16:33:50 +0200
commit2edffe37576e8968b8cfff2de26d8a6c756aed57 (patch)
tree33922d4587d0c4e5f650a66ccf67cf67cf7c28af
parent6a0c93a03dafaab66a6b2747d8b7142e69266027 (diff)
downloadalsa-lib-2edffe37576e8968b8cfff2de26d8a6c756aed57.tar.gz
pcm: remove alloca() from snd_spcm_init()
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> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--src/pcm/pcm_simple.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/pcm/pcm_simple.c b/src/pcm/pcm_simple.c
index ce110833..3ae24ff8 100644
--- a/src/pcm/pcm_simple.c
+++ b/src/pcm/pcm_simple.c
@@ -164,14 +164,11 @@ int snd_spcm_init(snd_pcm_t *pcm,
snd_spcm_xrun_type_t xrun_type)
{
int err;
- snd_pcm_hw_params_t *hw_params;
- snd_pcm_sw_params_t *sw_params;
+ snd_pcm_hw_params_t hw_params = {0};
+ snd_pcm_sw_params_t sw_params = {0};
unsigned int rrate;
unsigned int buffer_time;
- snd_pcm_hw_params_alloca(&hw_params);
- snd_pcm_sw_params_alloca(&sw_params);
-
assert(pcm);
assert(rate >= 5000 && rate <= 192000);
assert(channels >= 1 && channels <= 512);
@@ -180,13 +177,13 @@ int snd_spcm_init(snd_pcm_t *pcm,
err = set_buffer_time(latency, &buffer_time);
if (err < 0)
return err;
- err = set_hw_params(pcm, hw_params,
+ err = set_hw_params(pcm, &hw_params,
&rrate, channels, format, subformat,
&buffer_time, NULL, access);
if (err < 0)
return err;
- err = set_sw_params(pcm, sw_params, xrun_type);
+ err = set_sw_params(pcm, &sw_params, xrun_type);
if (err < 0)
return err;