validity checks for pa_context_is_pending()

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@679 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/polyp/context.c b/src/polyp/context.c
index 845e88d9a2296452da93c28fa00ebcb5f5f923e7..6fe008ea58ce0589461285f16c70ec6f7a7db580 100644 (file)
--- a/src/polyp/context.c
+++ b/src/polyp/context.c
@@ -728,9 +728,8 @@ int pa_context_is_pending(pa_context *c) {
     assert(c);
     assert(c->ref >= 1);
 
-/*     pa_log("pstream: %i", pa_pstream_is_pending(c->pstream)); */
-/*     pa_log("pdispatch: %i", pa_pdispatch_is_pending(c->pdispatch)); */
-    
+    PA_CHECK_VALIDITY_RETURN_ANY(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE, -1);
+
     return (c->pstream && pa_pstream_is_pending(c->pstream)) ||
         (c->pdispatch && pa_pdispatch_is_pending(c->pdispatch)) ||
         c->client;

diff --git a/src/polyp/stream.c b/src/polyp/stream.c
index 0fcc36b7a4452e31c54d02567977184af01eeb05..ca107750e276cc6b27b2c59b16bb7e8bdc7a3101 100644 (file)
--- a/src/polyp/stream.c
+++ b/src/polyp/stream.c
@@ -1235,5 +1235,3 @@ const pa_channel_map* pa_stream_get_channel_map(pa_stream *s) {
 
     return &s->channel_map;
 }
-
-