X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_conn.c;h=9a7399e01a8ea7ec9479e9f3075e36db0003b99c;hb=1b83f8f8f326eca9d8852c82dd36696f81a720dc;hp=0148abf56d7dc1b6ca27abf3b44284e1896fb3a2;hpb=47ceed78612d48dcda62cc2686fc527d61abe38b;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index 0148abf..9a7399e 100644
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -70,9 +70,7 @@ static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
     _xcb_out_write_block(c, parts, count);
     ret = _xcb_out_flush(c);
     pthread_mutex_unlock(&c->iolock);
-    if(ret <= 0)
-        return 0;
-    return 1;
+    return ret;
 }
 
 static int read_setup(XCBConnection *c)
@@ -180,24 +178,13 @@ void XCBDisconnect(XCBConnection *c)
 
 int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *cond)
 {
-    int ret = 1;
+    int ret;
     fd_set rfds, wfds;
-#if USE_THREAD_ASSERT
-    static __thread int already_here = 0;
-
-    assert(!already_here);
-    ++already_here;
-#endif
-
-    _xcb_assert_valid_sequence(c);
 
     /* If the thing I should be doing is already being done, wait for it. */
     if(should_write ? c->out.writing : c->in.reading)
     {
         pthread_cond_wait(cond, &c->iolock);
-#if USE_THREAD_ASSERT
-        --already_here;
-#endif
         return 1;
     }
 
@@ -213,27 +200,21 @@ int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *con
     }
 
     pthread_mutex_unlock(&c->iolock);
-    ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+    ret = select(c->fd + 1, &rfds, &wfds, 0, 0) > 0;
     pthread_mutex_lock(&c->iolock);
 
-    if(ret <= 0) /* error: select failed */
-        goto done;
-
-    if(FD_ISSET(c->fd, &rfds))
-        if((ret = _xcb_in_read(c)) <= 0)
-            goto done;
+    if(ret)
+    {
+        if(FD_ISSET(c->fd, &rfds))
+            ret = ret && _xcb_in_read(c);
 
-    if(FD_ISSET(c->fd, &wfds))
-        if((ret = _xcb_out_write(c)) <= 0)
-            goto done;
+        if(FD_ISSET(c->fd, &wfds))
+            ret = ret && _xcb_out_write(c);
+    }
 
-done:
     if(should_write)
         --c->out.writing;
     --c->in.reading;
 
-#if USE_THREAD_ASSERT
-    --already_here;
-#endif
     return ret;
 }