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

mixer: remove alloca() from enum_item_name_ops()

Browse source 
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>
This commit is contained in:
Takashi Sakamoto 2016-07-15 09:23:27 +09:00 • committed by Takashi Iwai
parent 6ed7471573
commit ed49382fda
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/mixer/simple_none.c
View file

@ -1313,7 +1313,7 @@ static int enum_item_name_ops(snd_mixer_elem_t *elem,
size_t maxlen, char *buf) size_t maxlen, char *buf)
{ {
selem_none_t *s = snd_mixer_elem_get_private(elem); 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; snd_hctl_elem_t *helem;
int type; int type;
@ -1330,11 +1330,10 @@ static int enum_item_name_ops(snd_mixer_elem_t *elem,
assert(helem); assert(helem);
if (item >= (unsigned int)s->ctls[type].max) if (item >= (unsigned int)s->ctls[type].max)
return -EINVAL; return -EINVAL;
snd_ctl_elem_info_alloca(&info); snd_hctl_elem_info(helem, &info);
snd_hctl_elem_info(helem, info); snd_ctl_elem_info_set_item(&info, item);
snd_ctl_elem_info_set_item(info, item); snd_hctl_elem_info(helem, &info);
snd_hctl_elem_info(helem, info); strncpy(buf, snd_ctl_elem_info_get_item_name(&info), maxlen);
strncpy(buf, snd_ctl_elem_info_get_item_name(info), maxlen);
return 0; return 0;
} }