summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Guthrie <cguthrie@mandriva.org>2009-10-19 21:50:03 +0100
committerColin Guthrie <cguthrie@mandriva.org>2009-11-11 17:44:28 +0000
commitff71cbfb0efb5d428206ae298583e6537298f42b (patch)
treee7cfd4c546a39aca3ea7f636532fe4172211605c
parent5382455d5ed04eaf581df0aefcc569e2527754ac (diff)
device-manager: Fix compiler warning.
Do not use a variable called 'index' as it clashes with string.h
-rw-r--r--src/modules/module-device-manager.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c
index e31586447..3991043d3 100644
--- a/src/modules/module-device-manager.c
+++ b/src/modules/module-device-manager.c
@@ -1033,13 +1033,13 @@ 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;
- uint32_t index = PA_INVALID_INDEX;
+ uint32_t found_index = PA_INVALID_INDEX;
if ((devname = get_name(name, "sink:"))) {
pa_sink* s;
PA_IDXSET_FOREACH(s, u->core->sinks, idx) {
if (strcmp(s->name, devname) == 0) {
- index = s->index;
+ found_index = s->index;
break;
}
}
@@ -1048,7 +1048,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
pa_source* s;
PA_IDXSET_FOREACH(s, u->core->sources, idx) {
if (strcmp(s->name, devname) == 0) {
- index = s->index;
+ found_index = s->index;
break;
}
}
@@ -1058,7 +1058,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
pa_tagstruct_puts(reply, name);
pa_tagstruct_puts(reply, e->description);
pa_tagstruct_puts(reply, e->icon);
- pa_tagstruct_putu32(reply, index);
+ pa_tagstruct_putu32(reply, found_index);
pa_tagstruct_putu32(reply, NUM_ROLES);
for (uint32_t i = ROLE_NONE; i < NUM_ROLES; ++i) {