projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added xcb_sumof() with restriction to uint8_t
[free-sw/xcb/libxcb]
/
src
/
xcb_util.c
diff --git
a/src/xcb_util.c
b/src/xcb_util.c
index
cc4e24a
..
58bd12d
100644
(file)
--- a/
src/xcb_util.c
+++ b/
src/xcb_util.c
@@
-59,6
+59,16
@@
int xcb_popcount(uint32_t mask)
return ((y + (y >> 3)) & 030707070707) % 077;
}
return ((y + (y >> 3)) & 030707070707) % 077;
}
+int xcb_sumof(uint8_t *list, int len)
+{
+ int i, s = 0;
+ for(i=0; i<len; i++) {
+ s += *list;
+ list++;
+ }
+ return s;
+}
+
static int _xcb_parse_display(const char *name, char **host, char **protocol,
int *displayp, int *screenp)
{
static int _xcb_parse_display(const char *name, char **host, char **protocol,
int *displayp, int *screenp)
{
@@
-129,7
+139,7
@@
int xcb_parse_display(const char *name, char **host, int *displayp,
return _xcb_parse_display(name, host, NULL, displayp, screenp);
}
return _xcb_parse_display(name, host, NULL, displayp, screenp);
}
-static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port);
+static int _xcb_open_tcp(c
onst c
har *host, char *protocol, const unsigned short port);
static int _xcb_open_unix(char *protocol, const char *file);
#ifdef DNETCONN
static int _xcb_open_decnet(const char *host, char *protocol, const unsigned short port);
static int _xcb_open_unix(char *protocol, const char *file);
#ifdef DNETCONN
static int _xcb_open_decnet(const char *host, char *protocol, const unsigned short port);
@@
-138,25
+148,25
@@
static int _xcb_open_decnet(const char *host, char *protocol, const unsigned sho
static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen);
#endif
static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen);
#endif
-static int _xcb_open(char *host, char *protocol, const int display)
+static int _xcb_open(c
onst c
har *host, char *protocol, const int display)
{
{
-#ifdef HAVE_ABSTRACT_SOCKETS
int fd;
int fd;
-#endif
static const char unix_base[] = "/tmp/.X11-unix/X";
const char *base = unix_base;
size_t filelen;
char *file = NULL;
int actual_filelen;
static const char unix_base[] = "/tmp/.X11-unix/X";
const char *base = unix_base;
size_t filelen;
char *file = NULL;
int actual_filelen;
- if(*host)
- {
#ifdef HAVE_LAUNCHD
if(strncmp(host, "/tmp/launch", 11) == 0) {
#ifdef HAVE_LAUNCHD
if(strncmp(host, "/tmp/launch", 11) == 0) {
- base = host;
- } else {
+ base = host;
+ host = "";
+ protocol = NULL;
+ }
#endif
#endif
+ if(*host || protocol)
+ {
#ifdef DNETCONN
/* DECnet displays have two colons, so _xcb_parse_display will have
left one at the end. However, an IPv6 address can end with *two*
#ifdef DNETCONN
/* DECnet displays have two colons, so _xcb_parse_display will have
left one at the end. However, an IPv6 address can end with *two*
@@
-177,9
+187,6
@@
static int _xcb_open(char *host, char *protocol, const int display)
unsigned short port = X_TCP_PORT + display;
return _xcb_open_tcp(host, protocol, port);
}
unsigned short port = X_TCP_PORT + display;
return _xcb_open_tcp(host, protocol, port);
}
-#ifdef HAVE_LAUNCHD
- }
-#endif
}
filelen = strlen(base) + 1 + sizeof(display) * 3 + 1;
}
filelen = strlen(base) + 1 + sizeof(display) * 3 + 1;
@@
-189,7
+196,7
@@
static int _xcb_open(char *host, char *protocol, const int display)
/* display specifies Unix socket */
#ifdef HAVE_LAUNCHD
/* display specifies Unix socket */
#ifdef HAVE_LAUNCHD
- if(
base == host
)
+ if(
strncmp(base, "/tmp/launch", 11) == 0
)
actual_filelen = snprintf(file, filelen, "%s:%d", base, display);
else
#endif
actual_filelen = snprintf(file, filelen, "%s:%d", base, display);
else
#endif
@@
-272,7
+279,7
@@
static int _xcb_open_decnet(const char *host, const char *protocol, const unsign
}
#endif
}
#endif
-static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
+static int _xcb_open_tcp(c
onst c
har *host, char *protocol, const unsigned short port)
{
int fd = -1;
struct addrinfo hints;
{
int fd = -1;
struct addrinfo hints;
@@
-280,8
+287,15
@@
static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
struct addrinfo *results, *addr;
char *bracket;
struct addrinfo *results, *addr;
char *bracket;
- if (protocol && strcmp("tcp",protocol))
+ if (protocol && strcmp("tcp",protocol) && strcmp("inet",protocol)
+#ifdef AF_INET6
+ && strcmp("inet6",protocol)
+#endif
+ )
return -1;
return -1;
+
+ if (*host == '\0')
+ host = "localhost";
memset(&hints, 0, sizeof(hints));
#ifdef AI_ADDRCONFIG
memset(&hints, 0, sizeof(hints));
#ifdef AI_ADDRCONFIG