[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-180-gbec67cd

[Colin Guthrie]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  c9375aa5e936cf896946f1f7bd80cce9cfe5d9a1 (commit)

- Log -----------------------------------------------------------------
bec67cd device-manager: Fix compiler warning.
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-device-manager.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------

commit bec67cd75f10643ca20cbf512531f05c3338ee8e
Author: Colin Guthrie <cguthrie at mandriva.org>
Date:   Mon Oct 19 21:50:03 2009 +0100

    device-manager: Fix compiler warning.
    
    Do not use a variable called 'index' as it clashes with string.h

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) {

-- 
hooks/post-receive
PulseAudio Sound Server