mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-10 13:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a nasty typo in pa_asyncq_pop

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1480 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-06-14 20:11:46 +00:00
parent 572c77f418
commit 1c62ce6f86
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/pulsecore/asyncq.c
View file

@ -141,9 +141,11 @@ int pa_asyncq_push(pa_asyncq*l, void *p, int wait) {
int x[20]; int x[20];
errno = 0; errno = 0;
if ((r = read(l->write_fds[0], x, sizeof(x))) <= 0 && errno != EINTR) if ((r = read(l->write_fds[0], x, sizeof(x))) < 0 && errno != EINTR)
return -1; return -1;
pa_assert(r != 0);
if (r > 0) if (r > 0)
if (pa_atomic_sub(&l->n_read, r) <= r) if (pa_atomic_sub(&l->n_read, r) <= r)
break; break;
@ -174,6 +176,8 @@ int pa_asyncq_push(pa_asyncq*l, void *p, int wait) {
return -1; return -1;
} }
pa_assert(r != 0);
if (r > 0) if (r > 0)
pa_atomic_sub(&l->n_read, r); pa_atomic_sub(&l->n_read, r);
} }
@ -220,9 +224,11 @@ void* pa_asyncq_pop(pa_asyncq*l, int wait) {
int x[20]; int x[20];
errno = 0; errno = 0;
if ((r = read(l->read_fds[0], x, sizeof(x))) <= 0 && errno != EINTR) if ((r = read(l->read_fds[0], x, sizeof(x))) < 0 && errno != EINTR)
return NULL; return NULL;
pa_assert(r != 0);
if (r > 0) if (r > 0)
if (pa_atomic_sub(&l->n_written, r) <= r) if (pa_atomic_sub(&l->n_written, r) <= r)
break; break;
@ -246,11 +252,13 @@ void* pa_asyncq_pop(pa_asyncq*l, int wait) {
_Y; _Y;
if ((r = read(l->read_fds[0], x, sizeof(x)) < 0) && errno != EINTR) { if ((r = read(l->read_fds[0], x, sizeof(x))) < 0 && errno != EINTR) {
pa_atomic_dec(&l->read_waiting); pa_atomic_dec(&l->read_waiting);
return NULL; return NULL;
} }
pa_assert(r != 0);
if (r > 0) if (r > 0)
pa_atomic_sub(&l->n_written, r); pa_atomic_sub(&l->n_written, r);
} }
@ -312,7 +320,4 @@ void pa_asyncq_after_poll(pa_asyncq *l) {
pa_assert(pa_atomic_load(&l->read_waiting) > 0); pa_assert(pa_atomic_load(&l->read_waiting) > 0);
pa_atomic_dec(&l->read_waiting); pa_atomic_dec(&l->read_waiting);
} }