summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-01-14 17:36:44 +0100
committerLennart Poettering <lennart@poettering.net>2009-01-14 17:36:44 +0100
commit20edd846d073507adcfd30d2eb678f965de37e2d (patch)
tree235dd9609b7606680819157a0845d93379b6c92d
parent587a08bae417d65f5b51da50706fe1c964275f1d (diff)
make pa_asyncq_push() fail under no circumstances.
-rw-r--r--src/pulsecore/asyncq.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/pulsecore/asyncq.c b/src/pulsecore/asyncq.c
index f64931a5..c9815054 100644
--- a/src/pulsecore/asyncq.c
+++ b/src/pulsecore/asyncq.c
@@ -163,14 +163,14 @@ static int push(pa_asyncq*l, void *p, pa_bool_t wait) {
return 0;
}
-static pa_bool_t flush_postq(pa_asyncq *l) {
+static pa_bool_t flush_postq(pa_asyncq *l, pa_bool_t wait) {
struct localq *q;
pa_assert(l);
while ((q = l->last_localq)) {
- if (push(l, q->data, FALSE) < 0)
+ if (push(l, q->data, wait) < 0)
return FALSE;
l->last_localq = q->prev;
@@ -187,7 +187,7 @@ static pa_bool_t flush_postq(pa_asyncq *l) {
int pa_asyncq_push(pa_asyncq*l, void *p, pa_bool_t wait) {
pa_assert(l);
- if (!flush_postq(l))
+ if (!flush_postq(l, wait))
return -1;
return push(l, p, wait);
@@ -199,8 +199,9 @@ void pa_asyncq_post(pa_asyncq*l, void *p) {
pa_assert(l);
pa_assert(p);
- if (pa_asyncq_push(l, p, FALSE) >= 0)
- return;
+ if (flush_postq(l, FALSE))
+ if (pa_asyncq_push(l, p, FALSE) >= 0)
+ return;
/* OK, we couldn't push anything in the queue. So let's queue it
* locally and push it later */
@@ -299,7 +300,7 @@ void pa_asyncq_write_before_poll(pa_asyncq *l) {
for (;;) {
- if (flush_postq(l))
+ if (flush_postq(l, FALSE))
break;
if (pa_fdsem_before_poll(l->read_fdsem) >= 0) {