diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2016-07-14 23:07:44 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-07-14 16:33:51 +0200 |
| commit | e26ee8dff6b0ecefc17d12ee1899abecc0097429 (patch) | |
| tree | f70a57b7c665d3d9a28f6000ebc4ecb3d19742e0 | |
| parent | c0cc9a01950e9059514c1787ce247b111baa0bd0 (diff) | |
| download | alsa-lib-e26ee8dff6b0ecefc17d12ee1899abecc0097429.tar.gz | |
conf: remove alloca() from snd_func_pcm_args_by_class()
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/confmisc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/confmisc.c b/src/confmisc.c index 2275ccdc..99be48b8 100644 --- a/src/confmisc.c +++ b/src/confmisc.c @@ -1053,7 +1053,7 @@ int snd_func_pcm_args_by_class(snd_config_t **dst, snd_config_t *root, snd_confi { snd_config_t *n; snd_ctl_t *ctl = NULL; - snd_pcm_info_t *info; + snd_pcm_info_t info = {0}; const char *id; int card = -1, dev; long class, index; @@ -1091,7 +1091,6 @@ int snd_func_pcm_args_by_class(snd_config_t **dst, snd_config_t *root, snd_confi goto __out; } - snd_pcm_info_alloca(&info); while(1) { err = snd_card_next(&card); if (err < 0) { @@ -1106,7 +1105,6 @@ int snd_func_pcm_args_by_class(snd_config_t **dst, snd_config_t *root, snd_confi goto __out; } dev = -1; - memset(info, 0, snd_pcm_info_sizeof()); while(1) { err = snd_ctl_pcm_next_device(ctl, &dev); if (err < 0) { @@ -1115,11 +1113,11 @@ int snd_func_pcm_args_by_class(snd_config_t **dst, snd_config_t *root, snd_confi } if (dev < 0) break; - snd_pcm_info_set_device(info, dev); - err = snd_ctl_pcm_info(ctl, info); + snd_pcm_info_set_device(&info, dev); + err = snd_ctl_pcm_info(ctl, &info); if (err < 0) continue; - if (snd_pcm_info_get_class(info) == (snd_pcm_class_t)class && + if (snd_pcm_info_get_class(&info) == (snd_pcm_class_t)class && index == idx++) goto __out; } |