summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-08-30 22:39:24 +0000
committerLennart Poettering <lennart@poettering.net>2007-08-30 22:39:24 +0000
commit747b01be9430f82ffec0d4e726d64bb83ded3f77 (patch)
tree91e7b20e53abbc1fbafbec7db2bc0bc26103c0c6
parentee97c4295aa1b75c2ad37a32a152fa3c15aa59db (diff)
make passing a code pointer to pa_asyncmsgq_get() optional
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1725 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/asyncmsgq.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pulsecore/asyncmsgq.c b/src/pulsecore/asyncmsgq.c
index cc57d3a6..e3a1ba91 100644
--- a/src/pulsecore/asyncmsgq.c
+++ b/src/pulsecore/asyncmsgq.c
@@ -169,7 +169,6 @@ int pa_asyncmsgq_send(pa_asyncmsgq *a, pa_msgobject *object, int code, const voi
int pa_asyncmsgq_get(pa_asyncmsgq *a, pa_msgobject **object, int *code, void **userdata, int64_t *offset, pa_memchunk *chunk, int wait) {
pa_assert(PA_REFCNT_VALUE(a) > 0);
- pa_assert(code);
pa_assert(!a->current);
if (!(a->current = pa_asyncq_pop(a->asyncq, wait))) {
@@ -179,7 +178,8 @@ int pa_asyncmsgq_get(pa_asyncmsgq *a, pa_msgobject **object, int *code, void **u
/* pa_log("success"); */
- *code = a->current->code;
+ if (code)
+ *code = a->current->code;
if (userdata)
*userdata = a->current->userdata;
if (offset)
@@ -191,7 +191,7 @@ int pa_asyncmsgq_get(pa_asyncmsgq *a, pa_msgobject **object, int *code, void **u
if (chunk)
*chunk = a->current->memchunk;
- pa_log_debug("Get q=%p object=%p (%s) code=%i data=%p chunk.length=%lu", (void*) a, (void*) a->current->object, a->current->object ? a->current->object->parent.type_name : NULL, a->current->code, (void*) a->current->userdata, (unsigned long) a->current->memchunk.length);
+/* pa_log_debug("Get q=%p object=%p (%s) code=%i data=%p chunk.length=%lu", (void*) a, (void*) a->current->object, a->current->object ? a->current->object->parent.type_name : NULL, a->current->code, (void*) a->current->userdata, (unsigned long) a->current->memchunk.length); */
return 0;
}