summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-09-27 16:31:56 +0200
committerLennart Poettering <lennart@poettering.net>2008-09-27 16:31:56 +0200
commit87971c8707cf84e0f386b5fe5329c8aff155e629 (patch)
treec71478cbcd9ec8623c91a5ada896c0cdb00f375c
parent9adf7c56b8a17deed9bb980275226143f594099c (diff)
fix compilation errors in priority queue code
-rw-r--r--src/pulsecore/prioq.c5
-rw-r--r--src/pulsecore/prioq.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/pulsecore/prioq.c b/src/pulsecore/prioq.c
index 18bed140..693dc517 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 85a6627c..fd3550b7 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);