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

darwin: Use read(2) rather than recv(2) 

2dcf8b025b was causing some regressions on
darwin, so go back to using read(2) there until I have time to investigate
further.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2012-03-08 00:50:13 -08:00
parent 7d235c62f0
commit 9061ee45b8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xcb_in.c
View File

@ -269,7 +269,11 @@ static int read_block(const int fd, void *buf, const ssize_t len)
int done = 0; int done = 0;
while(done < len) while(done < len)
{ {
#ifdef __APPLE__
int ret = read(fd, ((char *) buf) + done, len - done);
#else
int ret = recv(fd, ((char *) buf) + done, len - done,MSG_WAITALL); int ret = recv(fd, ((char *) buf) + done, len - done,MSG_WAITALL);
#endif
if(ret > 0) if(ret > 0)
done += ret; done += ret;
#ifndef _WIN32 #ifndef _WIN32
@ -661,7 +665,11 @@ void _xcb_in_replies_done(xcb_connection_t *c)
int _xcb_in_read(xcb_connection_t *c) int _xcb_in_read(xcb_connection_t *c)
{ {
#ifdef __APPLE__
int n = read(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len);
#else
int n = recv(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len,MSG_WAITALL); int n = recv(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len,MSG_WAITALL);
#endif
if(n > 0) if(n > 0)
c->in.queue_len += n; c->in.queue_len += n;
while(read_packet(c)) while(read_packet(c))