summaryrefslogtreecommitdiffstats
path: root/src/modules/module-device-manager.c
diff options
context:
space:
mode:
authorDiego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>2009-11-21 00:47:44 +0100
committerDiego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>2009-11-21 00:47:44 +0100
commit62278b4b94212c5ab2f3041cac8b68e6c2bd35fe (patch)
treed588137ebf41f4d490e031947c7c4782ba8da07f /src/modules/module-device-manager.c
parentd963998676397e14cfd0fa04e98cdca21abed4ef (diff)
Avoid using devname as a variable name.
On FreeBSD, devname() is a system function, and was overshadowed.
Diffstat (limited to 'src/modules/module-device-manager.c')
-rw-r--r--src/modules/module-device-manager.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c
index 3991043d..8d61ff4c 100644
--- a/src/modules/module-device-manager.c
+++ b/src/modules/module-device-manager.c
@@ -1032,27 +1032,27 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
if ((e = read_entry(u, name))) {
uint32_t idx;
- char *devname;
+ char *device_name;
uint32_t found_index = PA_INVALID_INDEX;
- if ((devname = get_name(name, "sink:"))) {
+ if ((device_name = get_name(name, "sink:"))) {
pa_sink* s;
PA_IDXSET_FOREACH(s, u->core->sinks, idx) {
- if (strcmp(s->name, devname) == 0) {
+ if (strcmp(s->name, device_name) == 0) {
found_index = s->index;
break;
}
}
- pa_xfree(devname);
- } else if ((devname = get_name(name, "source:"))) {
+ pa_xfree(device_name);
+ } else if ((device_name = get_name(name, "source:"))) {
pa_source* s;
PA_IDXSET_FOREACH(s, u->core->sources, idx) {
- if (strcmp(s->name, devname) == 0) {
+ if (strcmp(s->name, device_name) == 0) {
found_index = s->index;
break;
}
}
- pa_xfree(devname);
+ pa_xfree(device_name);
}
pa_tagstruct_puts(reply, name);