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

Use unsigned to compare and rename sync 

- i must be unsigned to be compare in the loop
- sync shadow global sync() function

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-08-27 13:56:24 +02:00
parent 6438584285
commit 1bbdba5211
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/xcb_out.c
View File

@ -111,7 +111,7 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect
uint16_t len; uint16_t len;
} fields; } fields;
uint32_t packet; uint32_t packet;
} sync = { { /* GetInputFocus */ 43, 0, 1 } }; } sync_req = { { /* GetInputFocus */ 43, 0, 1 } };
unsigned int request; unsigned int request;
uint32_t prefix[3] = { 0 }; uint32_t prefix[3] = { 0 };
int veclen = req->count; int veclen = req->count;
@ -127,7 +127,7 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect
if(!(flags & XCB_REQUEST_RAW)) if(!(flags & XCB_REQUEST_RAW))
{ {
static const char pad[3]; static const char pad[3];
int i; unsigned int i;
uint16_t shortlen = 0; uint16_t shortlen = 0;
size_t longlen = 0; size_t longlen = 0;
assert(vector[0].iov_len >= 4); assert(vector[0].iov_len >= 4);
@ -193,16 +193,16 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect
_xcb_wait_io(c, &c->out.cond); _xcb_wait_io(c, &c->out.cond);
request = ++c->out.request; request = ++c->out.request;
/* send GetInputFocus (sync) when 64k-2 requests have been sent without /* send GetInputFocus (sync_req) when 64k-2 requests have been sent without
* a reply. * a reply.
* Also send sync (could use NoOp) at 32-bit wrap to avoid having * Also send sync_req (could use NoOp) at 32-bit wrap to avoid having
* applications see sequence 0 as that is used to indicate * applications see sequence 0 as that is used to indicate
* an error in sending the request */ * an error in sending the request */
while((req->isvoid && while((req->isvoid &&
c->out.request == c->in.request_expected + (1 << 16) - 1) || c->out.request == c->in.request_expected + (1 << 16) - 1) ||
request == 0) request == 0)
{ {
prefix[0] = sync.packet; prefix[0] = sync_req.packet;
_xcb_in_expect_reply(c, request, WORKAROUND_NONE, XCB_REQUEST_DISCARD_REPLY); _xcb_in_expect_reply(c, request, WORKAROUND_NONE, XCB_REQUEST_DISCARD_REPLY);
c->in.request_expected = c->out.request; c->in.request_expected = c->out.request;
request = ++c->out.request; request = ++c->out.request;