API/ABI change: XCBSendRequest returns the sequence number instead of using an out...

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

diff --git a/src/xcb_out.c b/src/xcb_out.c
index 78ec8ca..367013a 100644 (file)
--- a/src/xcb_out.c
+++ b/src/xcb_out.c
@@ -69,15 +69,14 @@ CARD32 XCBGetMaximumRequestLength(XCBConnection *c)
     return c->out.maximum_request_length;
 }
 
-int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct iovec *vector, const XCBProtocolRequest *req)
+unsigned int XCBSendRequest(XCBConnection *c, int flags, struct iovec *vector, const XCBProtocolRequest *req)
 {
-    int ret;
+    unsigned int request;
     CARD32 prefix[2];
     int veclen = req->count;
     enum workarounds workaround = WORKAROUND_NONE;
 
     assert(c != 0);
-    assert(request != 0);
     assert(vector != 0);
     assert(req->count > 0);
 
@@ -92,8 +91,8 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
         if(req->ext)
         {
             const XCBQueryExtensionRep *extension = XCBGetExtensionData(c, req->ext);
-            /* TODO: better error handling here, please! */
-            assert(extension && extension->present);
+            if(!(extension && extension->present))
+                return 0;
             ((CARD8 *) vector[0].iov_base)[0] = extension->major_opcode;
             ((CARD8 *) vector[0].iov_base)[1] = req->opcode;
         }
@@ -126,8 +125,7 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
         ((CARD16 *) vector[0].iov_base)[1] = shortlen;
         if(!shortlen)
         {
-            memmove(vector + 1, vector, veclen++ * sizeof(*vector));
-            ++veclen;
+            --vector, ++veclen;
             vector[0].iov_base = prefix;
             vector[0].iov_len = sizeof(prefix);
             prefix[0] = ((CARD32 *) vector[0].iov_base)[0];
@@ -149,20 +147,22 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
     if(req->isvoid && !force_sequence_wrap(c))
     {
         pthread_mutex_unlock(&c->iolock);
-        return -1;
+        return 0;
     }
 
     /* wait for other writing threads to get out of my way. */
     while(c->out.writing)
         pthread_cond_wait(&c->out.cond, &c->iolock);
 
-    *request = ++c->out.request;
+    request = ++c->out.request;
+    assert(request != 0);
 
-    _xcb_in_expect_reply(c, *request, workaround, flags);
+    _xcb_in_expect_reply(c, request, workaround, flags);
 
-    ret = _xcb_out_write_block(c, vector, veclen);
+    if(!_xcb_out_write_block(c, vector, veclen))
+        request = 0;
     pthread_mutex_unlock(&c->iolock);
-    return ret;
+    return request;
 }
 
 int XCBFlush(XCBConnection *c)
@@ -237,12 +237,14 @@ int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count)
     {
         memcpy(c->out.queue + c->out.queue_len, vector[0].iov_base, vector[0].iov_len);
         c->out.queue_len += vector[0].iov_len;
+        vector[0].iov_base = (char *) vector[0].iov_base + vector[0].iov_len;
+        vector[0].iov_len = 0;
         ++vector, --count;
     }
     if(!count)
         return 1;
 
-    memmove(vector + 1, vector, count++ * sizeof(struct iovec));
+    --vector, ++count;
     vector[0].iov_base = c->out.queue;
     vector[0].iov_len = c->out.queue_len;
     c->out.queue_len = 0;