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

Coalesce readn into _xcb_in_read and simplify.

This commit is contained in:
Jamey Sharp 2006-02-24 00:59:08 -08:00
parent 3f8d0bd532
commit e1c2777aba
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xcb_in.c
View File

@ -69,14 +69,6 @@ static void wake_up_next_reader(XCBConnection *c)
assert(pthreadret == 0); assert(pthreadret == 0);
} }
static int readn(const int fd, void *buf, const int buflen, int *count)
{
int n = read(fd, ((char *) buf) + *count, buflen - *count);
if(n > 0)
*count += n;
return n;
}
static int read_packet(XCBConnection *c) static int read_packet(XCBConnection *c)
{ {
XCBGenericRep genrep; XCBGenericRep genrep;
@ -336,7 +328,9 @@ int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workaround
int _xcb_in_read(XCBConnection *c) int _xcb_in_read(XCBConnection *c)
{ {
int n = readn(c->fd, c->in.queue, sizeof(c->in.queue), &c->in.queue_len); int n = read(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len);
if(n > 0)
c->in.queue_len += n;
while(read_packet(c)) while(read_packet(c))
/* empty */; /* empty */;
return (n > 0) || (n < 0 && errno == EAGAIN); return (n > 0) || (n < 0 && errno == EAGAIN);