projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More return value changes, and make _xcb_in_read_packet static since it is not called...
[free-sw/xcb/libxcb]
/
src
/
xcb_out.c
diff --git
a/src/xcb_out.c
b/src/xcb_out.c
index
a215bcc
..
62d7053
100644
(file)
--- a/
src/xcb_out.c
+++ b/
src/xcb_out.c
@@
-174,7
+174,6
@@
int _xcb_out_init(_xcb_out *out)
out->vec = 0;
out->vec_len = 0;
out->vec = 0;
out->vec_len = 0;
- out->last_request = 0;
out->request = 0;
out->request_written = 0;
out->request = 0;
out->request_written = 0;
@@
-200,8
+199,9
@@
int _xcb_out_write(XCBConnection *c)
else
n = _xcb_write(c->fd, &c->out.queue, &c->out.queue_len);
else
n = _xcb_write(c->fd, &c->out.queue, &c->out.queue_len);
- if(n < 0 && errno == EAGAIN)
- n = 1;
+ /* XXX: should "nothing was written" be considered failure or
+ * success for this function? it's not an I/O error, but... */
+ n = (n > 0) || (n < 0 && errno == EAGAIN);
if(c->out.vec_len)
{
if(c->out.vec_len)
{
@@
-259,7
+259,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_len = XCB_PAD(vector[i].iov_len);
}
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);
}
- if(
_xcb_out_flush(c) <= 0
)
+ if(
!_xcb_out_flush(c)
)
len = -1;
free(c->out.vec);
c->out.vec = 0;
len = -1;
free(c->out.vec);
c->out.vec = 0;
@@
-270,10
+270,9
@@
int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count)
int _xcb_out_flush(XCBConnection *c)
{
int ret = 1;
int _xcb_out_flush(XCBConnection *c)
{
int ret = 1;
- while(ret > 0 && (c->out.queue_len || c->out.vec_len))
- ret = _xcb_conn_wait(c, /*should_write*/ 1, &c->out.cond);
- c->out.last_request = 0;
c->out.request_written = c->out.request;
c->out.request_written = c->out.request;
+ while(ret && (c->out.queue_len || c->out.vec_len))
+ ret = _xcb_conn_wait(c, /*should_write*/ 1, &c->out.cond);
pthread_cond_broadcast(&c->out.cond);
return ret;
}
pthread_cond_broadcast(&c->out.cond);
return ret;
}