mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

conf: remove alloca() from snd_func_card_name()

Browse source 
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>
This commit is contained in:
Takashi Sakamoto 2016-07-14 23:07:42 +09:00 • committed by Takashi Iwai
parent d270bd9558
commit e1f4b9a7ca
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/confmisc.c
View file

@ -913,7 +913,7 @@ int snd_func_card_name(snd_config_t **dst, snd_config_t *root,
snd_config_t *src, snd_config_t *private_data) snd_config_t *src, snd_config_t *private_data)
{ {
snd_ctl_t *ctl = NULL; snd_ctl_t *ctl = NULL;
snd_ctl_card_info_t *info; snd_ctl_card_info_t info = {0};
const char *id; const char *id;
int card, err; int card, err;
@ -925,8 +925,7 @@ int snd_func_card_name(snd_config_t **dst, snd_config_t *root,
SNDERR("could not open control for card %i", card); SNDERR("could not open control for card %i", card);
goto __error; goto __error;
} }
snd_ctl_card_info_alloca(&info); err = snd_ctl_card_info(ctl, &info);
err = snd_ctl_card_info(ctl, info);
if (err < 0) { if (err < 0) {
SNDERR("snd_ctl_card_info error: %s", snd_strerror(err)); SNDERR("snd_ctl_card_info error: %s", snd_strerror(err));
goto __error; goto __error;
@ -934,7 +933,7 @@ int snd_func_card_name(snd_config_t **dst, snd_config_t *root,
err = snd_config_get_id(src, &id); err = snd_config_get_id(src, &id);
if (err >= 0) if (err >= 0)
err = snd_config_imake_safe_string(dst, id, err = snd_config_imake_safe_string(dst, id,
snd_ctl_card_info_get_name(info)); snd_ctl_card_info_get_name(&info));
__error: __error:
if (ctl) if (ctl)
snd_ctl_close(ctl); snd_ctl_close(ctl);