]> git.alsa-project.org Git - alsa-lib.git/commitdiff
pcm: remove alloca() from snd_spcm_init()
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Thu, 14 Jul 2016 14:07:34 +0000 (23:07 +0900)
committerTakashi Iwai <tiwai@suse.de>
Thu, 14 Jul 2016 14:33:50 +0000 (16:33 +0200)
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>
src/pcm/pcm_simple.c

index ce110833922e5e4b8e32936c2ca43ed1e807f6a1..3ae24ff845e9574a6038f43ec72928288c9c548f 100644 (file)
@@ -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;