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

snd_device_name_hint(): do not change the global error handler.

Browse source 
This is the first step towards making this function reentrant.

Signed-off-by: Jerome Forissier <jerome@taodyne.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Jerome Forissier 2013-01-31 15:47:24 +01:00 • committed by Takashi Iwai
parent 44c1a623dd
commit 25dbb10281
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/control/namehint.c
View file

@ -80,7 +80,8 @@ static void zero_handler(const char *file ATTRIBUTE_UNUSED,
int line ATTRIBUTE_UNUSED, int line ATTRIBUTE_UNUSED,
const char *function ATTRIBUTE_UNUSED, const char *function ATTRIBUTE_UNUSED,
int err ATTRIBUTE_UNUSED, int err ATTRIBUTE_UNUSED,
const char *fmt ATTRIBUTE_UNUSED, ...) const char *fmt ATTRIBUTE_UNUSED,
va_list arg ATTRIBUTE_UNUSED)
{ {
} }
@ -212,7 +213,7 @@ static int try_config(struct hint_list *list,
const char *base, const char *base,
const char *name) const char *name)
{ {
snd_lib_error_handler_t eh; snd_local_error_handler_t eh;
snd_config_t *res = NULL, *cfg, *cfg1, *n; snd_config_t *res = NULL, *cfg, *cfg1, *n;
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
char *buf, *buf1 = NULL, *buf2; char *buf, *buf1 = NULL, *buf2;
@ -239,10 +240,9 @@ static int try_config(struct hint_list *list,
sprintf(buf, "%s:CARD=%s", name, snd_ctl_card_info_get_id(list->info)); sprintf(buf, "%s:CARD=%s", name, snd_ctl_card_info_get_id(list->info));
else else
strcpy(buf, name); strcpy(buf, name);
eh = snd_lib_error; eh = snd_lib_error_set_local(&zero_handler);
snd_lib_error_set_handler(&zero_handler);
err = snd_config_search_definition(snd_config, base, buf, &res); err = snd_config_search_definition(snd_config, base, buf, &res);
snd_lib_error_set_handler(eh); snd_lib_error_set_local(eh);
if (err < 0) if (err < 0)
goto __skip_add; goto __skip_add;
cleanup_res = 1; cleanup_res = 1;
@ -337,10 +337,9 @@ static int try_config(struct hint_list *list,
goto __ok; goto __ok;
/* find, if all parameters have a default, */ /* find, if all parameters have a default, */
/* otherwise filter this definition */ /* otherwise filter this definition */
eh = snd_lib_error; eh = snd_lib_error_set_local(&zero_handler);
snd_lib_error_set_handler(&zero_handler);
err = snd_config_search_alias_hooks(snd_config, base, buf, &res); err = snd_config_search_alias_hooks(snd_config, base, buf, &res);
snd_lib_error_set_handler(eh); snd_lib_error_set_local(eh);
if (err < 0) if (err < 0)
goto __cleanup; goto __cleanup;
if (snd_config_search(res, "@args", &cfg) >= 0) { if (snd_config_search(res, "@args", &cfg) >= 0) {