diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2016-07-15 09:23:27 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-07-15 08:16:35 +0200 |
| commit | ed49382fdaf6157fc59763d358868ce3a82c6adf (patch) | |
| tree | 0cff02bce297797ae6246bce9571106b2f7dbf44 | |
| parent | 6ed747157395b83e4bf1a93088e73f06479beb5c (diff) | |
| download | alsa-lib-ed49382fdaf6157fc59763d358868ce3a82c6adf.tar.gz | |
mixer: remove alloca() from enum_item_name_ops()
Both of alloca() and automatic variables keep 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/mixer/simple_none.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index 0799ceb3..ab2b1515 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -1313,7 +1313,7 @@ static int enum_item_name_ops(snd_mixer_elem_t *elem, size_t maxlen, char *buf) { selem_none_t *s = snd_mixer_elem_get_private(elem); - snd_ctl_elem_info_t *info; + snd_ctl_elem_info_t info = {0}; snd_hctl_elem_t *helem; int type; @@ -1330,11 +1330,10 @@ static int enum_item_name_ops(snd_mixer_elem_t *elem, assert(helem); if (item >= (unsigned int)s->ctls[type].max) return -EINVAL; - snd_ctl_elem_info_alloca(&info); - snd_hctl_elem_info(helem, info); - snd_ctl_elem_info_set_item(info, item); - snd_hctl_elem_info(helem, info); - strncpy(buf, snd_ctl_elem_info_get_item_name(info), maxlen); + snd_hctl_elem_info(helem, &info); + snd_ctl_elem_info_set_item(&info, item); + snd_hctl_elem_info(helem, &info); + strncpy(buf, snd_ctl_elem_info_get_item_name(&info), maxlen); return 0; } |