X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_util.c;h=3d6006c18a362ef3863bfc36ef7828f2a0507fca;hb=a1eff0c49a2dbb328a79edbeb2b851fa1dfe9e61;hp=db3bffb459212eceacaca8c4a63655178d351a12;hpb=55c1842686d2e668708cd106b5e08847df0184c3;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_util.c b/src/xcb_util.c index db3bffb..3d6006c 100644 --- a/src/xcb_util.c +++ b/src/xcb_util.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -197,49 +196,3 @@ int XCBSync(XCBConnection *c, XCBGenericError **e) free(reply); return reply != 0; } - -/* The functions beyond this point still use only public interfaces, - * but are not themselves part of the public interface. So their - * prototypes are in xcbint.h. */ - -#include "xcbint.h" - -int _xcb_set_fd_flags(const int fd) -{ - long flags = fcntl(fd, F_GETFL, 0); - if(flags == -1) - return 0; - flags |= O_NONBLOCK; - if(fcntl(fd, F_SETFL, flags) == -1) - return 0; - if(fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) - return 0; - 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); - if(ret < 0 && errno == EAGAIN) - { - fd_set fds; - FD_ZERO(&fds); - FD_SET(fd, &fds); - ret = select(fd + 1, &fds, 0, 0, 0); - } - if(ret <= 0) - return ret; - } - return len; -}