static int set_fd_flags(const int fd)
{
- long flags = fcntl(fd, F_GETFL, 0);
+ int flags = fcntl(fd, F_GETFL, 0);
if(flags == -1)
return 0;
flags |= O_NONBLOCK;
xcb_setup_request_t out;
struct iovec parts[6];
int count = 0;
- int endian = 0x01020304;
+ static const uint32_t endian = 0x01020304;
int ret;
memset(&out, 0, sizeof(out));
parts[count].iov_len = XCB_PAD(out.authorization_protocol_data_len);
parts[count++].iov_base = (char *) pad;
}
- assert(count <= sizeof(parts) / sizeof(*parts));
+ assert(count <= (int) (sizeof(parts) / sizeof(*parts)));
- pthread_mutex_lock(&c->iolock);
+ _xcb_lock_io(c);
{
struct iovec *parts_ptr = parts;
ret = _xcb_out_send(c, &parts_ptr, &count);
}
- pthread_mutex_unlock(&c->iolock);
+ _xcb_unlock_io(c);
return ret;
}
c->has_error = 1;
}
+void _xcb_lock_io(xcb_connection_t *c)
+{
+ pthread_mutex_lock(&c->iolock);
+}
+
+void _xcb_unlock_io(xcb_connection_t *c)
+{
+ pthread_mutex_unlock(&c->iolock);
+}
+
+void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond)
+{
+ pthread_cond_wait(cond, &c->iolock);
+}
+
int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count)
{
int ret;
/* If the thing I should be doing is already being done, wait for it. */
if(count ? c->out.writing : c->in.reading)
{
- pthread_cond_wait(cond, &c->iolock);
+ _xcb_wait_io(c, cond);
return 1;
}
++c->out.writing;
}
- pthread_mutex_unlock(&c->iolock);
+ _xcb_unlock_io(c);
do {
ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
} while (ret == -1 && errno == EINTR);
_xcb_conn_shutdown(c);
ret = 0;
}
- pthread_mutex_lock(&c->iolock);
+ _xcb_lock_io(c);
if(ret)
{