diff options
| author | Jamey Sharp <jamey@minilop.net> | 2006-02-24 01:50:48 -0800 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2006-02-24 01:50:48 -0800 |
| commit | bae98d36040d0cda1862839410cf92bac3927280 (patch) | |
| tree | 8f945da5a3f4a9814889f3a6bc1a9ce7293141a3 /src/xcb_conn.c | |
| parent | 67b2649dc4b6726c6d11fb0e41429ae5de82b0e8 (diff) | |
Move _xcb_set_fd_flags to xcb_conn.c and make it static. xcb_util.c now has only public functions.
Diffstat (limited to 'src/xcb_conn.c')
| -rw-r--r-- | src/xcb_conn.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/xcb_conn.c b/src/xcb_conn.c index 698cf51..5839ed8 100644 --- a/src/xcb_conn.c +++ b/src/xcb_conn.c @@ -32,10 +32,24 @@ #include <stdlib.h> #include <netinet/in.h> #include <sys/select.h> +#include <sys/fcntl.h> #include "xcb.h" #include "xcbint.h" +static int 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; +} + static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info) { static const char pad[3]; @@ -147,7 +161,7 @@ XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info) c->fd = fd; if(!( - _xcb_set_fd_flags(fd) && + set_fd_flags(fd) && pthread_mutex_init(&c->iolock, 0) == 0 && _xcb_in_init(&c->in) && _xcb_out_init(&c->out) && |