static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
{
+ static const char pad[3];
XCBConnSetupReq out;
- struct iovec parts[3];
+ struct iovec parts[6];
int count = 0;
int endian = 0x01020304;
int ret;
out.authorization_protocol_data_len = 0;
parts[count].iov_len = sizeof(XCBConnSetupReq);
parts[count++].iov_base = &out;
+ parts[count].iov_len = XCB_PAD(sizeof(XCBConnSetupReq));
+ parts[count++].iov_base = (caddr_t) pad;
if(auth_info)
{
parts[count].iov_len = out.authorization_protocol_name_len = auth_info->namelen;
parts[count++].iov_base = auth_info->name;
+ parts[count].iov_len = XCB_PAD(out.authorization_protocol_name_len);
+ parts[count++].iov_base = (caddr_t) pad;
parts[count].iov_len = out.authorization_protocol_data_len = auth_info->datalen;
parts[count++].iov_base = auth_info->data;
+ parts[count].iov_len = XCB_PAD(out.authorization_protocol_data_len);
+ parts[count++].iov_base = (caddr_t) pad;
}
+ assert(count <= sizeof(parts) / sizeof(*parts));
pthread_mutex_lock(&c->iolock);
_xcb_out_write_block(c, parts, count);
ret = _xcb_out_flush(c);
pthread_mutex_unlock(&c->iolock);
- if(ret <= 0)
- return 0;
- return 1;
+ return ret;
}
static int read_setup(XCBConnection *c)
int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *cond)
{
- int ret = 1;
+ int ret;
fd_set rfds, wfds;
- _xcb_assert_valid_sequence(c);
-
/* If the thing I should be doing is already being done, wait for it. */
if(should_write ? c->out.writing : c->in.reading)
{
}
pthread_mutex_unlock(&c->iolock);
- ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+ ret = select(c->fd + 1, &rfds, &wfds, 0, 0) > 0;
pthread_mutex_lock(&c->iolock);
- if(ret <= 0) /* error: select failed */
- goto done;
-
- if(FD_ISSET(c->fd, &rfds))
- if((ret = _xcb_in_read(c)) <= 0)
- goto done;
+ if(ret)
+ {
+ if(FD_ISSET(c->fd, &rfds))
+ ret = ret && _xcb_in_read(c);
- if(FD_ISSET(c->fd, &wfds))
- if((ret = _xcb_out_write(c)) <= 0)
- goto done;
+ if(FD_ISSET(c->fd, &wfds))
+ ret = ret && _xcb_out_write(c);
+ }
-done:
if(should_write)
--c->out.writing;
--c->in.reading;
- return ret > 0;
+ return ret;
}