frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More return value changes.

This commit is contained in:
Jamey Sharp 2006-02-23 11:50:12 -08:00
parent 662479760c
commit 5b1d39e27b
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/xcb_conn.c
View File

@ -70,9 +70,7 @@ static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
_xcb_out_write_block(c, parts, count); _xcb_out_write_block(c, parts, count);
ret = _xcb_out_flush(c); ret = _xcb_out_flush(c);
pthread_mutex_unlock(&c->iolock); pthread_mutex_unlock(&c->iolock);
if(ret <= 0) return ret;
return 0;
return 1;
} }
static int read_setup(XCBConnection *c) static int read_setup(XCBConnection *c)
@ -180,7 +178,7 @@ void XCBDisconnect(XCBConnection *c)
int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *cond) int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *cond)
{ {
int ret = 1; int ret;
fd_set rfds, wfds; fd_set rfds, wfds;
_xcb_assert_valid_sequence(c); _xcb_assert_valid_sequence(c);
@ -204,24 +202,21 @@ int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *con
} }
pthread_mutex_unlock(&c->iolock); 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); pthread_mutex_lock(&c->iolock);
if(ret <= 0) /* error: select failed */ if(ret)
goto done; {
if(FD_ISSET(c->fd, &rfds))
ret = ret && _xcb_in_read(c) > 0;
if(FD_ISSET(c->fd, &rfds)) if(FD_ISSET(c->fd, &wfds))
if((ret = _xcb_in_read(c)) <= 0) ret = ret && _xcb_out_write(c) > 0;
goto done; }
if(FD_ISSET(c->fd, &wfds))
if((ret = _xcb_out_write(c)) <= 0)
goto done;
done:
if(should_write) if(should_write)
--c->out.writing; --c->out.writing;
--c->in.reading; --c->in.reading;
return ret > 0; return ret;
} }

2
src/xcb_in.c
View File

@ -82,7 +82,7 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **
/* If this request has not been written yet, write it. */ /* If this request has not been written yet, write it. */
if((signed int) (c->out.request_written - request) < 0) if((signed int) (c->out.request_written - request) < 0)
if(_xcb_out_flush(c) <= 0) if(!_xcb_out_flush(c))
goto done; /* error */ goto done; /* error */
if(_xcb_list_find(c->in.readers, match_reply, &request)) if(_xcb_list_find(c->in.readers, match_reply, &request))

2
src/xcb_out.c
View File

@ -258,7 +258,7 @@ int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count)
c->out.vec[c->out.vec_len].iov_base = (void *) pad; c->out.vec[c->out.vec_len].iov_base = (void *) pad;
c->out.vec[c->out.vec_len++].iov_len = XCB_PAD(vector[i].iov_len); c->out.vec[c->out.vec_len++].iov_len = XCB_PAD(vector[i].iov_len);
} }
if(_xcb_out_flush(c) <= 0) if(!_xcb_out_flush(c))
len = -1; len = -1;
free(c->out.vec); free(c->out.vec);
c->out.vec = 0; c->out.vec = 0;