out.authorization_protocol_data_len = 0;
parts[count].iov_len = sizeof(XCBConnSetupReq);
parts[count++].iov_base = &out;
out.authorization_protocol_data_len = 0;
parts[count].iov_len = sizeof(XCBConnSetupReq);
parts[count++].iov_base = &out;
if(auth_info)
{
parts[count].iov_len = out.authorization_protocol_name_len = auth_info->namelen;
parts[count++].iov_base = auth_info->name;
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 = out.authorization_protocol_data_len = auth_info->datalen;
parts[count++].iov_base = auth_info->data;
parts[count].iov_len = out.authorization_protocol_data_len = auth_info->datalen;
parts[count++].iov_base = auth_info->data;
pthread_mutex_lock(&c->iolock);
_xcb_out_write_block(c, parts, count);
ret = _xcb_out_flush(c);
pthread_mutex_unlock(&c->iolock);
pthread_mutex_lock(&c->iolock);
_xcb_out_write_block(c, parts, count);
ret = _xcb_out_flush(c);
pthread_mutex_unlock(&c->iolock);
- if(_xcb_read_block(c->fd, c->setup, sizeof(XCBConnSetupGenericRep)) != sizeof(XCBConnSetupGenericRep))
+ if(_xcb_in_read_block(c, c->setup, sizeof(XCBConnSetupGenericRep)) != sizeof(XCBConnSetupGenericRep))
- if(_xcb_read_block(c->fd, (char *) c->setup + sizeof(XCBConnSetupGenericRep), c->setup->length * 4) <= 0)
+ if(_xcb_in_read_block(c, (char *) c->setup + sizeof(XCBConnSetupGenericRep), c->setup->length * 4) <= 0)
/* If the thing I should be doing is already being done, wait for it. */
if(should_write ? c->out.writing : c->in.reading)
{
pthread_cond_wait(cond, &c->iolock);
/* If the thing I should be doing is already being done, wait for it. */
if(should_write ? c->out.writing : c->in.reading)
{
pthread_cond_wait(cond, &c->iolock);
- ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+ ret = select(c->fd + 1, &rfds, &wfds, 0, 0) > 0;
- 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);
+ }