Make xcb_conn.c agree that XCBSetupReq is now XCBSetupRequest.

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

diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index 29d91f4..c00eccf 100644 (file)
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -62,7 +62,7 @@ static int set_fd_flags(const int fd)
 static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
 {
     static const char pad[3];
-    XCBSetupReq out;
+    XCBSetupRequest out;
     struct iovec parts[6];
     int count = 0;
     int endian = 0x01020304;
@@ -79,9 +79,9 @@ static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
     out.protocol_minor_version = X_PROTOCOL_REVISION;
     out.authorization_protocol_name_len = 0;
     out.authorization_protocol_data_len = 0;
-    parts[count].iov_len = sizeof(XCBSetupReq);
+    parts[count].iov_len = sizeof(XCBSetupRequest);
     parts[count++].iov_base = &out;
-    parts[count].iov_len = XCB_PAD(sizeof(XCBSetupReq));
+    parts[count].iov_len = XCB_PAD(sizeof(XCBSetupRequest));
     parts[count++].iov_base = (char *) pad;
 
     if(auth_info)
@@ -156,7 +156,10 @@ static int write_vec(XCBConnection *c, struct iovec **vector, int *count)
     if(n < 0 && errno == EAGAIN)
         return 1;
     if(n <= 0)
+    {
+        _xcb_conn_shutdown(c);
         return 0;
+    }
 
     for(; *count; --*count, ++*vector)
     {
@@ -280,7 +283,10 @@ int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector
        ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
     } while (ret == -1 && errno == EINTR);
     if (ret < 0)
+    {
+        _xcb_conn_shutdown(c);
        ret = 0;
+    }
     pthread_mutex_lock(&c->iolock);
 
     if(ret)