mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed get_ascii (null string), fixed hooks_load_for_all (aliases)

Browse source
This commit is contained in:
Jaroslav Kysela 2001-12-29 22:27:44 +00:00
parent f422fb9a78
commit 10f3957571
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/conf.c
View file

@ -1948,7 +1948,12 @@ int snd_config_get_ascii(const snd_config_t *config, char **ascii)
} }
break; break;
case SND_CONFIG_TYPE_STRING: case SND_CONFIG_TYPE_STRING:
*ascii = strdup(config->u.string); if (config->u.string)
*ascii = strdup(config->u.string);
else {
*ascii = NULL;
return 0;
}
break; break;
default: default:
return -EINVAL; return -EINVAL;
@ -2548,9 +2553,6 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
err = snd_determine_driver(card, &fdriver); err = snd_determine_driver(card, &fdriver);
if (err < 0) if (err < 0)
return err; return err;
err = snd_config_imake_string(&private_data, "string", fdriver);
if (err < 0)
goto __err;
if (snd_config_search(root, fdriver, &n) >= 0) { if (snd_config_search(root, fdriver, &n) >= 0) {
if (snd_config_get_string(n, &driver) < 0) if (snd_config_get_string(n, &driver) < 0)
continue; continue;
@ -2565,6 +2567,9 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
} else { } else {
driver = fdriver; driver = fdriver;
} }
err = snd_config_imake_string(&private_data, "string", driver);
if (err < 0)
goto __err;
err = snd_config_hook_load(root, config, &n, private_data); err = snd_config_hook_load(root, config, &n, private_data);
__err: __err:
if (private_data) if (private_data)