From bec67cd75f10643ca20cbf512531f05c3338ee8e Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 19 Oct 2009 21:50:03 +0100 Subject: [PATCH] device-manager: Fix compiler warning. Do not use a variable called 'index' as it clashes with string.h --- src/modules/module-device-manager.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c index e315864..3991043 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) { -- 2.7.4