projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove _xcb_assert_valid_sequence. One test is trivially true, and the other may...
[free-sw/xcb/libxcb]
/
src
/
xcb_conn.c
diff --git
a/src/xcb_conn.c
b/src/xcb_conn.c
index
50512ee
..
9a7399e
100644
(file)
--- a/
src/xcb_conn.c
+++ b/
src/xcb_conn.c
@@
-70,9
+70,7
@@
static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
_xcb_out_write_block(c, parts, count);
ret = _xcb_out_flush(c);
pthread_mutex_unlock(&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)
}
static int read_setup(XCBConnection *c)
@@
-180,11
+178,9
@@
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);
-
/* If the thing I should be doing is already being done, wait for it. */
if(should_write ? c->out.writing : c->in.reading)
{
/* If the thing I should be doing is already being done, wait for it. */
if(should_write ? c->out.writing : c->in.reading)
{
@@
-204,21
+200,18
@@
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 */
- 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;
if(should_write)
--c->out.writing;
--c->in.reading;