aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/xcb_disp.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-08-24 09:19:29 +0000
committermarha <marha@users.sourceforge.net>2010-08-24 09:19:29 +0000
commitd23cfa7fb93fc22ea11fd25d50aecb10582e32b2 (patch)
tree9d4ecabe1468173bd22c4aed9d5a132e8dfe2d03 /libX11/src/xcb_disp.c
parenta3f15e28f545a51f0a0139c38944ed324bafb94f (diff)
downloadvcxsrv-d23cfa7fb93fc22ea11fd25d50aecb10582e32b2.tar.gz
vcxsrv-d23cfa7fb93fc22ea11fd25d50aecb10582e32b2.tar.bz2
vcxsrv-d23cfa7fb93fc22ea11fd25d50aecb10582e32b2.zip
libX11 git update 24/8/2010
Diffstat (limited to 'libX11/src/xcb_disp.c')
-rw-r--r--libX11/src/xcb_disp.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/libX11/src/xcb_disp.c b/libX11/src/xcb_disp.c
index 2def9b014..60d186a5e 100644
--- a/libX11/src/xcb_disp.c
+++ b/libX11/src/xcb_disp.c
@@ -54,11 +54,10 @@ void XSetAuthorization(char *name, int namelen, char *data, int datalen)
_XUnlockMutex(_Xglobal_lock);
}
-int _XConnectXCB(Display *dpy, _Xconst char *display, char **fullnamep, int *screenp)
+int _XConnectXCB(Display *dpy, _Xconst char *display, int *screenp)
{
char *host;
int n = 0;
- int len;
xcb_connection_t *c;
dpy->fd = -1;
@@ -69,20 +68,7 @@ int _XConnectXCB(Display *dpy, _Xconst char *display, char **fullnamep, int *scr
if(!xcb_parse_display(display, &host, &n, screenp))
return 0;
-
- len = strlen(host) + (1 + 20 + 1 + 20 + 1);
- *fullnamep = Xmalloc(len);
- if (!*fullnamep) {
- free(host);
- return 0;
- }
-
-#ifdef HAVE_LAUNCHD
- if(strncmp(host, "/tmp/launch", 11) == 0)
- snprintf(*fullnamep, len, "%s:%d", host, n);
- else
-#endif
- snprintf(*fullnamep, len, "%s:%d.%d", host, n, *screenp);
+ /* host and n are unused, but xcb_parse_display requires them */
free(host);
_XLockMutex(_Xglobal_lock);