 @@ -26,41 +26,42 @@
 /* Stuff that reads stuff from the server. */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
 #include "xcb.h"
 #include "xcbext.h"
 #include "xcbint.h"
 #if USE_POLL
 #include <poll.h>
 #endif
 #ifndef _WIN32
 #include <sys/select.h>
 #include <sys/socket.h>
 #endif
 #ifdef _WIN32
 #include "xcb_windefs.h"
 #endif /* _WIN32 */
 #include "xcb.h"
 #include "xcbext.h"
 #include "xcbint.h"
 #define XCB_ERROR 0
 #define XCB_REPLY 1
 #define XCB_XGE_EVENT 35
 struct event_list {
     xcb_generic_event_t *event;
     struct event_list *next;
 };
 struct xcb_special_event {
     struct xcb_special_event *next;
 @@ -190,29 +191,29 @@ static int read_packet(xcb_connection_t
             c->in.request_expected = c->in.request_read;
         if(c->in.request_read != lastread)
+        {
             if(c->in.current_reply)
+            {
                 _xcb_map_put(c->in.replies, lastread, c->in.current_reply);
                 c->in.current_reply = 0;
                 c->in.current_reply_tail = &c->in.current_reply;
+            }
             c->in.request_completed = c->in.request_read - 1;
+        }
         while(c->in.pending_replies &&
               c->in.pending_replies->workaround != WORKAROUND_EXTERNAL_SOCKET_OWNER &&
-	      XCB_SEQUENCE_COMPARE (c->in.pending_replies->last_request, <=, c->in.request_completed))
+              XCB_SEQUENCE_COMPARE (c->in.pending_replies->last_request, <=, c->in.request_completed))
+        {
             pending_reply *oldpend = c->in.pending_replies;
             c->in.pending_replies = oldpend->next;
             if(!oldpend->next)
                 c->in.pending_replies_tail = &c->in.pending_replies;
             free(oldpend);
+        }
         if(genrep.response_type == XCB_ERROR)
             c->in.request_completed = c->in.request_read;
         remove_finished_readers(&c->in.readers, c->in.request_completed);
+    }
 @@ -376,31 +377,31 @@ static int read_block(const int fd, void
 #if USE_POLL
             struct pollfd pfd;
             pfd.fd = fd;
             pfd.events = POLLIN;
             pfd.revents = 0;
             do {
                 ret = poll(&pfd, 1, -1);
             } while (ret == -1 && errno == EINTR);
 #else
             fd_set fds;
             FD_ZERO(&fds);
             FD_SET(fd, &fds);
-	    /* Initializing errno here makes sure that for Win32 this loop will execute only once */
+            /* Initializing errno here makes sure that for Win32 this loop will execute only once */
-	    errno = 0;
+            errno = 0;
-	    do {
+            do {
-		ret = select(fd + 1, &fds, 0, 0, 0);
+                ret = select(fd + 1, &fds, 0, 0, 0);
-	    } while (ret == -1 && errno == EINTR);
+            } while (ret == -1 && errno == EINTR);
 #endif /* USE_POLL */
+        }
         if(ret <= 0)
             return ret;
+    }
     return len;
+}
 static int poll_for_reply(xcb_connection_t *c, uint64_t request, void **reply, xcb_generic_error_t **error)
+{
     struct reply_list *head;
     /* If an error occurred when issuing the request, fail immediately. */
 @@ -736,27 +737,27 @@ xcb_register_for_special_xge(xcb_connect
     pthread_mutex_lock(&c->iolock);
     for (se = c->in.special_events; se; se = se->next) {
         if (se->extension == ext_reply->major_opcode &&
             se->eid == eid) {
             pthread_mutex_unlock(&c->iolock);
             return NULL;
+        }
+    }
     se = calloc(1, sizeof(xcb_special_event_t));
     if (!se) {
         pthread_mutex_unlock(&c->iolock);
         return NULL;
+    }
     se->extension = ext_reply->major_opcode;
     se->eid = eid;
     se->events = NULL;
     se->events_tail = &se->events;
     se->stamp = stamp;
     pthread_cond_init(&se->special_event_cond, 0);
     se->next = c->in.special_events;
     c->in.special_events = se;
     pthread_mutex_unlock(&c->iolock);
     return se;