X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_conn.c;h=29d91f42bdbbaafa3618b443aaccd1d57d84dc25;hb=79e3227022ae3d66f9f3806d231fdeec2a06cc6b;hp=b0d727b78643c58850bd6a3a5720df448761a489;hpb=ac17ae62fe1a3a29991e36e35eeee838ac4acb00;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index b0d727b..29d91f4 100644
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -44,6 +44,8 @@ typedef struct {
     CARD16 length;
 } XCBSetupGeneric;
 
+static const int error_connection = 1;
+
 static int set_fd_flags(const int fd)
 {
     long flags = fcntl(fd, F_GETFL, 0);
@@ -177,12 +179,16 @@ static int write_vec(XCBConnection *c, struct iovec **vector, int *count)
 
 const XCBSetup *XCBGetSetup(XCBConnection *c)
 {
+    if(c->has_error)
+        return 0;
     /* doesn't need locking because it's never written to. */
     return c->setup;
 }
 
 int XCBGetFileDescriptor(XCBConnection *c)
 {
+    if(c->has_error)
+        return -1;
     /* doesn't need locking because it's never written to. */
     return c->fd;
 }
@@ -199,7 +205,7 @@ XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info)
 
     c = calloc(1, sizeof(XCBConnection));
     if(!c)
-        return 0;
+        return (XCBConnection *) &error_connection;
 
     c->fd = fd;
 
@@ -215,7 +221,7 @@ XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info)
         ))
     {
         XCBDisconnect(c);
-        return 0;
+        return (XCBConnection *) &error_connection;
     }
 
     return c;
@@ -223,7 +229,7 @@ XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info)
 
 void XCBDisconnect(XCBConnection *c)
 {
-    if(!c)
+    if(c->has_error)
         return;
 
     free(c->setup);
@@ -241,6 +247,11 @@ void XCBDisconnect(XCBConnection *c)
 
 /* Private interface */
 
+void _xcb_conn_shutdown(XCBConnection *c)
+{
+    c->has_error = 1;
+}
+
 int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector, int *count)
 {
     int ret;