[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.12-77-g87971c8

[Lennart Poettering]

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  9adf7c56b8a17deed9bb980275226143f594099c (commit)

- Log -----------------------------------------------------------------
87971c8... fix compilation errors in priority queue code
-----------------------------------------------------------------------

Summary of changes:
 src/pulsecore/prioq.c |    5 +++--
 src/pulsecore/prioq.h |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

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

commit 87971c8707cf84e0f386b5fe5329c8aff155e629
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Sep 27 16:31:56 2008 +0200

    fix compilation errors in priority queue code

diff --git a/src/pulsecore/prioq.c b/src/pulsecore/prioq.c
index 18bed14..693dc51 100644
--- a/src/pulsecore/prioq.c
+++ b/src/pulsecore/prioq.c
@@ -77,6 +77,8 @@ void pa_prioq_free(pa_prioq *q, pa_free2_cb_t free_cb, void *userdata) {
 }
 
 static void shuffle_up(pa_prioq *q, pa_prioq_item *i) {
+    unsigned j;
+
     pa_assert(q);
     pa_assert(i);
 
@@ -103,7 +105,6 @@ static void shuffle_up(pa_prioq *q, pa_prioq_item *i) {
 
 pa_prioq_item* pa_prioq_put(pa_prioq *q, void *p) {
     pa_prioq_item *i;
-    unsigned j;
 
     pa_assert(q);
 
@@ -251,5 +252,5 @@ void pa_prioq_reshuffle(pa_prioq *q, pa_prioq_item *i) {
     shuffle_down(q, i->idx);
 
     /* And this will move the entry up as far as necessary */
-    shuffle_up(q, i->idx);
+    shuffle_up(q, i);
 }
diff --git a/src/pulsecore/prioq.h b/src/pulsecore/prioq.h
index 85a6627..fd3550b 100644
--- a/src/pulsecore/prioq.h
+++ b/src/pulsecore/prioq.h
@@ -53,7 +53,7 @@ void* pa_prioq_pop(pa_prioq*q);
 void* pa_prioq_remove(pa_prioq*q, pa_prioq_item *i);
 
 /* The priority of an item was modified. Adjustthe queue to that */
-void pa_prioq_reshuffle(pa_prioq *q, pa_prioq_item *i)
+void pa_prioq_reshuffle(pa_prioq *q, pa_prioq_item *i);
 
 /* Return the current number of items in the prioq */
 unsigned pa_prioq_size(pa_prioq*s);

-- 
hooks/post-receive
PulseAudio Sound Server