From 41fea4472dec859ddec76bdfa7108ebec71de1e3 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 21 Mar 2014 19:36:05 +0100 Subject: xserver fontconfig libX11 libXext libxcb mesa git update 21 Mar 2014 xserver commit 4fb31e4824d46edc80bb49b4065152899faa5ac6 libxcb commit cb686b576739deea00180c54697c8b62b8419ae0 libX11 commit 8be4610939b833587954957f5963eb4191b43d19 libXext commit 11aad96bd689d54156064d2e81213dc827a689d1 fontconfig commit 5478192f379d784b421329e4bf72cc780818e467 mesa commit 8d8d0cb09eb8735a04fc36cc4d0e2dc9f9d460eb --- libxcb/src/xcb_util.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'libxcb/src/xcb_util.c') diff --git a/libxcb/src/xcb_util.c b/libxcb/src/xcb_util.c index 466dc23bc..1625742b1 100644 --- a/libxcb/src/xcb_util.c +++ b/libxcb/src/xcb_util.c @@ -243,8 +243,8 @@ static int _xcb_open(const char *host, char *protocol, const int display) free(file); if (fd < 0 && !protocol && *host == '\0') { - unsigned short port = X_TCP_PORT + display; - fd = _xcb_open_tcp(host, protocol, port); + unsigned short port = X_TCP_PORT + display; + fd = _xcb_open_tcp(host, protocol, port); } return fd; @@ -261,10 +261,10 @@ static int _xcb_socket(int family, int type, int proto) if (fd == -1 && errno == EINVAL) #endif { - fd = socket(family, type, proto); + fd = socket(family, type, proto); #ifndef _WIN32 - if (fd >= 0) - fcntl(fd, F_SETFD, FD_CLOEXEC); + if (fd >= 0) + fcntl(fd, F_SETFD, FD_CLOEXEC); #endif } return fd; @@ -272,15 +272,15 @@ static int _xcb_socket(int family, int type, int proto) static int _xcb_do_connect(int fd, const struct sockaddr* addr, int addrlen) { - int on = 1; + int on = 1; - if(fd < 0) - return -1; + if(fd < 0) + return -1; - setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)); - setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)); + setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)); + setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)); - return connect(fd, addr, addrlen); + return connect(fd, addr, addrlen); } static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short port) @@ -295,13 +295,13 @@ static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short if (protocol && strcmp("tcp",protocol) && strcmp("inet",protocol) #ifdef AF_INET6 - && strcmp("inet6",protocol) + && strcmp("inet6",protocol) #endif - ) + ) return -1; - + if (*host == '\0') - host = "localhost"; + host = "localhost"; #if HAVE_GETADDRINFO memset(&hints, 0, sizeof(hints)); @@ -434,7 +434,7 @@ xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname, xcb_connection_t *c; int parsed = _xcb_parse_display(displayname, &host, &protocol, &display, screenp); - + if(!parsed) { c = _xcb_conn_ret_error(XCB_CONN_CLOSED_PARSE_ERR); goto out; -- cgit v1.2.3