Make the return value of _xcb_conn_wait boolean, instead of syscall-like.

[free-sw/xcb/libxcb] / src / xcb_out.c

diff --git a/src/xcb_out.c b/src/xcb_out.c
index a215bcc..04b8365 100644 (file)
--- a/src/xcb_out.c
+++ b/src/xcb_out.c
@@ -174,7 +174,6 @@ int _xcb_out_init(_xcb_out *out)
     out->vec = 0;
     out->vec_len = 0;
 
-    out->last_request = 0;
     out->request = 0;
     out->request_written = 0;
 
@@ -270,10 +269,9 @@ int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count)
 int _xcb_out_flush(XCBConnection *c)
 {
     int ret = 1;
-    while(ret > 0 && (c->out.queue_len || c->out.vec_len))
-        ret = _xcb_conn_wait(c, /*should_write*/ 1, &c->out.cond);
-    c->out.last_request = 0;
     c->out.request_written = c->out.request;
+    while(ret && (c->out.queue_len || c->out.vec_len))
+        ret = _xcb_conn_wait(c, /*should_write*/ 1, &c->out.cond);
     pthread_cond_broadcast(&c->out.cond);
     return ret;
 }