X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_util.c;h=c9c7f9228aa1dac78d5ea640cde63384c6a31a9e;hb=838317f4d305e07f35ddd99e2ebccfa8fac680c6;hp=db3bffb459212eceacaca8c4a63655178d351a12;hpb=55c1842686d2e668708cd106b5e08847df0184c3;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_util.c b/src/xcb_util.c index db3bffb..c9c7f92 100644 --- a/src/xcb_util.c +++ b/src/xcb_util.c @@ -217,20 +217,14 @@ int _xcb_set_fd_flags(const int fd) return 1; } -int _xcb_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; -} - int _xcb_read_block(const int fd, void *buf, const size_t len) { int done = 0; while(done < len) { - int ret = _xcb_readn(fd, buf, len, &done); + int ret = read(fd, ((char *) buf) + done, len - done); + if(ret > 0) + done += ret; if(ret < 0 && errno == EAGAIN) { fd_set fds;