Move _xcb_write and _xcb_writev to xcb_out.c and make them static, since only _xcb_out_write calls them.

1 files changed, 35 insertions, 0 deletions

diff --git a/src/xcb_out.c b/src/xcb_out.c
index 62d7053..a3cb2e4 100644
--- a/src/xcb_out.c
+++ b/src/xcb_out.c
@@ -27,6 +27,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 #include <errno.h>
 
@@ -47,6 +48,40 @@ static int force_sequence_wrap(XCBConnection *c)
     return ret;
 }
 
+static int _xcb_write(const int fd, char (*buf)[], int *count)
+{
+    int n = write(fd, *buf, *count);
+    if(n > 0)
+    {
+        *count -= n;
+        if(*count)
+            memmove(*buf, *buf + n, *count);
+    }
+    return n;
+}
+
+static int _xcb_writev(const int fd, struct iovec *vec, int count)
+{
+    int n = writev(fd, vec, count);
+    if(n > 0)
+    {
+        int rem = n;
+        for(; count; --count, ++vec)
+        {
+            int cur = vec->iov_len;
+            if(cur > rem)
+                cur = rem;
+            vec->iov_len -= cur;
+            vec->iov_base = (char *) vec->iov_base + cur;
+            rem -= cur;
+            if(vec->iov_len)
+                break;
+        }
+        assert(rem == 0);
+    }
+    return n;
+}
+
 /* Public interface */
 
 CARD32 XCBGetMaximumRequestLength(XCBConnection *c)