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

index 864d5fa212eb37e28d2b5db0d1f1b02b25437aa7..e7a2393902adaf6a73918537f4c96167a725c0cf 100644 (file)
@@ -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");