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

alisp: remove alloca() from FA_hctl_elem_read()

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:49 +09:00 • committed by Takashi Iwai
parent f3562bea35
commit 499b0c0401
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/alisp/alisp_snd.c
View file

@ -622,8 +622,8 @@ static struct alisp_object * FA_hctl_elem_read(struct alisp_instance * instance,
{ {
snd_hctl_elem_t *handle; snd_hctl_elem_t *handle;
struct alisp_object * lexpr, * p1 = NULL, * obj; struct alisp_object * lexpr, * p1 = NULL, * obj;
snd_ctl_elem_info_t *info; snd_ctl_elem_info_t info = {0};
snd_ctl_elem_value_t *value; snd_ctl_elem_value_t value = {0};
snd_ctl_elem_type_t type; snd_ctl_elem_type_t type;
unsigned int idx, count; unsigned int idx, count;
int err; int err;
@ -634,16 +634,14 @@ static struct alisp_object * FA_hctl_elem_read(struct alisp_instance * instance,
handle = (snd_hctl_elem_t *)get_ptr(instance, p1, item->prefix); handle = (snd_hctl_elem_t *)get_ptr(instance, p1, item->prefix);
if (handle == NULL) if (handle == NULL)
return &alsa_lisp_nil; return &alsa_lisp_nil;
snd_ctl_elem_info_alloca(&info); err = snd_hctl_elem_info(handle, &info);
snd_ctl_elem_value_alloca(&value);
err = snd_hctl_elem_info(handle, info);
if (err >= 0) if (err >= 0)
err = snd_hctl_elem_read(handle, value); err = snd_hctl_elem_read(handle, &value);
lexpr = new_lexpr(instance, err); lexpr = new_lexpr(instance, err);
if (err < 0) if (err < 0)
return lexpr; return lexpr;
type = snd_ctl_elem_info_get_type(info); type = snd_ctl_elem_info_get_type(&info);
count = snd_ctl_elem_info_get_count(info); count = snd_ctl_elem_info_get_count(&info);
if (type == SND_CTL_ELEM_TYPE_IEC958) { if (type == SND_CTL_ELEM_TYPE_IEC958) {
count = sizeof(snd_aes_iec958_t); count = sizeof(snd_aes_iec958_t);
type = SND_CTL_ELEM_TYPE_BYTES; type = SND_CTL_ELEM_TYPE_BYTES;
@ -651,19 +649,19 @@ static struct alisp_object * FA_hctl_elem_read(struct alisp_instance * instance,
for (idx = 0; idx < count; idx++) { for (idx = 0; idx < count; idx++) {
switch (type) { switch (type) {
case SND_CTL_ELEM_TYPE_BOOLEAN: case SND_CTL_ELEM_TYPE_BOOLEAN:
obj = new_integer(instance, snd_ctl_elem_value_get_boolean(value, idx)); obj = new_integer(instance, snd_ctl_elem_value_get_boolean(&value, idx));
break; break;
case SND_CTL_ELEM_TYPE_INTEGER: case SND_CTL_ELEM_TYPE_INTEGER:
obj = new_integer(instance, snd_ctl_elem_value_get_integer(value, idx)); obj = new_integer(instance, snd_ctl_elem_value_get_integer(&value, idx));
break; break;
case SND_CTL_ELEM_TYPE_INTEGER64: case SND_CTL_ELEM_TYPE_INTEGER64:
obj = new_integer(instance, snd_ctl_elem_value_get_integer64(value, idx)); obj = new_integer(instance, snd_ctl_elem_value_get_integer64(&value, idx));
break; break;
case SND_CTL_ELEM_TYPE_ENUMERATED: case SND_CTL_ELEM_TYPE_ENUMERATED:
obj = new_integer(instance, snd_ctl_elem_value_get_enumerated(value, idx)); obj = new_integer(instance, snd_ctl_elem_value_get_enumerated(&value, idx));
break; break;
case SND_CTL_ELEM_TYPE_BYTES: case SND_CTL_ELEM_TYPE_BYTES:
obj = new_integer(instance, snd_ctl_elem_value_get_byte(value, idx)); obj = new_integer(instance, snd_ctl_elem_value_get_byte(&value, idx));
break; break;
default: default:
obj = NULL; obj = NULL;