[pulseaudio-commits] r1725 - /branches/lennart/src/pulsecore/asyncmsgq.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Aug 31 00:39:24 2007
New Revision: 1725

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1725&root=3Dpulseaudio&vi=
ew=3Drev
Log:
make passing a code pointer to pa_asyncmsgq_get() optional

Modified:
    branches/lennart/src/pulsecore/asyncmsgq.c

Modified: branches/lennart/src/pulsecore/asyncmsgq.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
asyncmsgq.c?rev=3D1725&root=3Dpulseaudio&r1=3D1724&r2=3D1725&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/asyncmsgq.c (original)
+++ branches/lennart/src/pulsecore/asyncmsgq.c Fri Aug 31 00:39:24 2007
@@ -169,7 +169,6 @@
 =

 int pa_asyncmsgq_get(pa_asyncmsgq *a, pa_msgobject **object, int *code, vo=
id **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 =3D pa_asyncq_pop(a->asyncq, wait))) {
@@ -179,7 +178,8 @@
 =

 /*     pa_log("success"); */
 =

-    *code =3D a->current->code;
+    if (code)
+        *code =3D a->current->code;
     if (userdata)
         *userdata =3D a->current->userdata;
     if (offset)
@@ -191,7 +191,7 @@
     if (chunk)
         *chunk =3D a->current->memchunk;
 =

-    pa_log_debug("Get q=3D%p object=3D%p (%s) code=3D%i data=3D%p chunk.le=
ngth=3D%lu", (void*) a, (void*) a->current->object, a->current->object ? a-=
>current->object->parent.type_name : NULL, a->current->code, (void*) a->cur=
rent->userdata, (unsigned long) a->current->memchunk.length);
+/*     pa_log_debug("Get q=3D%p object=3D%p (%s) code=3D%i data=3D%p chunk=
.length=3D%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;
 }