summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/pulsecore/pstream.c2
-rw-r--r--src/pulsecore/queue.c2
-rw-r--r--src/pulsecore/queue.h2
-rw-r--r--src/tests/queue-test.c6
4 files changed, 6 insertions, 6 deletions
diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c
index e26ca473c..6b1af67ba 100644
--- a/src/pulsecore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -942,7 +942,7 @@ pa_bool_t pa_pstream_is_pending(pa_pstream *p) {
if (p->dead)
b = FALSE;
else
- b = p->write.current || !pa_queue_is_empty(p->send_queue);
+ b = p->write.current || !pa_queue_isempty(p->send_queue);
return b;
}
diff --git a/src/pulsecore/queue.c b/src/pulsecore/queue.c
index 08fd14263..72e54670d 100644
--- a/src/pulsecore/queue.c
+++ b/src/pulsecore/queue.c
@@ -116,7 +116,7 @@ void* pa_queue_pop(pa_queue *q) {
return p;
}
-int pa_queue_is_empty(pa_queue *q) {
+int pa_queue_isempty(pa_queue *q) {
pa_assert(q);
return q->length == 0;
diff --git a/src/pulsecore/queue.h b/src/pulsecore/queue.h
index b09216cf5..c55ac4db5 100644
--- a/src/pulsecore/queue.h
+++ b/src/pulsecore/queue.h
@@ -35,6 +35,6 @@ void pa_queue_free(pa_queue* q, void (*destroy)(void *p, void *userdata), void *
void pa_queue_push(pa_queue *q, void *p);
void* pa_queue_pop(pa_queue *q);
-int pa_queue_is_empty(pa_queue *q);
+int pa_queue_isempty(pa_queue *q);
#endif
diff --git a/src/tests/queue-test.c b/src/tests/queue-test.c
index 105f094ab..ceae4e478 100644
--- a/src/tests/queue-test.c
+++ b/src/tests/queue-test.c
@@ -37,12 +37,12 @@ int main(int argc, char *argv[]) {
pa_assert_se(q = pa_queue_new());
- pa_assert(pa_queue_is_empty(q));
+ pa_assert(pa_queue_isempty(q));
pa_queue_push(q, (void*) "eins");
pa_log("%s\n", (char*) pa_queue_pop(q));
- pa_assert(pa_queue_is_empty(q));
+ pa_assert(pa_queue_isempty(q));
pa_queue_push(q, (void*) "zwei");
pa_queue_push(q, (void*) "drei");
@@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
pa_log("%s\n", (char*) pa_queue_pop(q));
pa_log("%s\n", (char*) pa_queue_pop(q));
- pa_assert(pa_queue_is_empty(q));
+ pa_assert(pa_queue_isempty(q));
pa_queue_push(q, (void*) "sechs");
pa_queue_push(q, (void*) "sieben");