mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

name clash (WINE, icc) interface -> iface rename

Browse source 
Fixes ALSA bug #1139.
This commit is contained in:
Jaroslav Kysela 2005-05-29 14:24:51 +00:00
parent c072e76136
commit e789209314
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/names.c
View file

@ -45,7 +45,7 @@
#define ALSA_NAMES_PATH2 "~/.asoundnm" #define ALSA_NAMES_PATH2 "~/.asoundnm"
#endif #endif
static int names_parse(snd_config_t *top, const char *interface, snd_devname_t **list) static int names_parse(snd_config_t *top, const char *iface, snd_devname_t **list)
{ {
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
snd_config_iterator_t j, jnext; snd_config_iterator_t j, jnext;
@ -54,7 +54,7 @@ static int names_parse(snd_config_t *top, const char *interface, snd_devname_t *
snd_devname_t *dn, *last = NULL; snd_devname_t *dn, *last = NULL;
int err; int err;
err = snd_config_search(top, interface, &top); err = snd_config_search(top, iface, &top);
if (err < 0) if (err < 0)
return err; return err;
snd_config_for_each(i, next, top) { snd_config_for_each(i, next, top) {
@ -119,21 +119,21 @@ static int names_parse(snd_config_t *top, const char *interface, snd_devname_t *
/** /**
* \brief Give a list of device names and associated comments for selected interface * \brief Give a list of device names and associated comments for selected interface
* \param interface a string identifying interface ("pcm", "ctl", "seq", "rawmidi") * \param iface a string identifying interface ("pcm", "ctl", "seq", "rawmidi")
* \param list result - a pointer to list * \param list result - a pointer to list
* \return A non-negative value if successful, otherwise a negative error code. * \return A non-negative value if successful, otherwise a negative error code.
* *
* The global configuration files are specified in the environment variable * The global configuration files are specified in the environment variable
* \c ALSA_NAMES_FILE. * \c ALSA_NAMES_FILE.
*/ */
int snd_names_list(const char *interface, snd_devname_t **list) int snd_names_list(const char *iface, snd_devname_t **list)
{ {
char *file; char *file;
snd_config_t *top; snd_config_t *top;
snd_input_t *in; snd_input_t *in;
int err; int err;
assert(interface); assert(iface);
assert(list); assert(list);
*list = NULL; *list = NULL;
file = getenv(ALSA_NAMES_ENV); file = getenv(ALSA_NAMES_ENV);
@ -160,7 +160,7 @@ int snd_names_list(const char *interface, snd_devname_t **list)
if (err < 0) { if (err < 0) {
SNDERR("%s may be old or corrupted: consider to remove or fix it", file); SNDERR("%s may be old or corrupted: consider to remove or fix it", file);
} else { } else {
err = names_parse(top, interface, list); err = names_parse(top, iface, list);
if (err < 0) { if (err < 0) {
snd_names_list_free(*list); snd_names_list_free(*list);
*list = NULL; *list = NULL;