fix compilation errors in priority queue code

This commit is contained in:
Lennart Poettering 2008-09-27 16:31:56 +02:00
parent 9adf7c56b8
commit 87971c8707
2 changed files with 4 additions and 3 deletions

View file

@ -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) { static void shuffle_up(pa_prioq *q, pa_prioq_item *i) {
unsigned j;
pa_assert(q); pa_assert(q);
pa_assert(i); 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* pa_prioq_put(pa_prioq *q, void *p) {
pa_prioq_item *i; pa_prioq_item *i;
unsigned j;
pa_assert(q); pa_assert(q);
@ -251,5 +252,5 @@ void pa_prioq_reshuffle(pa_prioq *q, pa_prioq_item *i) {
shuffle_down(q, i->idx); shuffle_down(q, i->idx);
/* And this will move the entry up as far as necessary */ /* And this will move the entry up as far as necessary */
shuffle_up(q, i->idx); shuffle_up(q, i);
} }

View file

@ -53,7 +53,7 @@ void* pa_prioq_pop(pa_prioq*q);
void* pa_prioq_remove(pa_prioq*q, pa_prioq_item *i); void* pa_prioq_remove(pa_prioq*q, pa_prioq_item *i);
/* The priority of an item was modified. Adjustthe queue to that */ /* 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 */ /* Return the current number of items in the prioq */
unsigned pa_prioq_size(pa_prioq*s); unsigned pa_prioq_size(pa_prioq*s);