xserver: Branch 'xorg-server-1.5-apple' - 2 commits
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Sun May 18 23:33:01 PDT 2008
hw/xquartz/bundle/Resources/X11.icns |binary
hw/xquartz/darwinEvents.c | 1 -
os/connection.c | 35 +++++------------------------------
3 files changed, 5 insertions(+), 31 deletions(-)
New commits:
commit 18a8825adc34cd8af16511c55ac2b4a74efcdfe5
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sun May 18 23:31:41 2008 -0700
XQuartz: Cleaned up ListenOnOpenFD...
(cherry picked from commit 6fb587d3d5fbbaee9e46cdce24d03e5d1c66d58a)
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 9ecebe4..0ecb064 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -220,7 +220,6 @@ static void kXquartzListenOnOpenFDHandler(int screenNum, xEventPtr xe, DeviceInt
TA_SERVER();
for (i=0; i<nevents; i++) {
- //sleep(20);
ListenOnOpenFD(xe[i].u.clientMessage.u.l.longs0);
}
}
diff --git a/os/connection.c b/os/connection.c
index fb366a9..8eb66b0 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -1304,8 +1304,7 @@ MakeClientGrabPervious(ClientPtr client)
/* Add a fd (from launchd) to our listeners */
_X_EXPORT void ListenOnOpenFD(int fd) {
char port[20];
- XtransConnInfo ciptr, *ciptr2, *ciptr3;
- int *iptr, *iptr2;
+ XtransConnInfo ciptr;
/* Sigh for inconsistencies. */
sprintf (port, ":%d", atoi(display));
@@ -1315,37 +1314,13 @@ _X_EXPORT void ListenOnOpenFD(int fd) {
*/
ciptr = _XSERVTransReopenCOTSServer(5, fd, port);
if(ciptr == NULL) {
- fprintf(stderr, "Got NULL while trying to Reopen launchd port.\n");
+ ErrorF("Got NULL while trying to Reopen launchd port.\n");
return;
}
/* Allocate space to store it */
- iptr = (int *) realloc(ListenTransFds, (ListenTransCount + 1) * sizeof (int));
-
- if(!iptr) {
- fprintf(stderr, "Memory allocation error");
- return;
- }
-
- ciptr2 = (XtransConnInfo *) realloc(ListenTransConns, (ListenTransCount + 1) * sizeof (XtransConnInfo));
- if(!ciptr2) {
- fprintf(stderr, "Memory allocation error");
- if(iptr != ListenTransFds)
- free(ListenTransFds);
- return;
- }
-
- if(iptr != ListenTransFds) {
- iptr2 = ListenTransFds;
- ListenTransFds = iptr;
- free(iptr2);
- }
-
- if(ciptr2 != ListenTransConns) {
- ciptr3 = ListenTransConns;
- ListenTransConns = ciptr2;
- free(ciptr3);
- }
+ ListenTransFds = (int *) xrealloc(ListenTransFds, (ListenTransCount + 1) * sizeof (int));
+ ListenTransConns = (XtransConnInfo *) xrealloc(ListenTransConns, (ListenTransCount + 1) * sizeof (XtransConnInfo));
/* Store it */
ListenTransConns[ListenTransCount] = ciptr;
@@ -1358,7 +1333,7 @@ _X_EXPORT void ListenOnOpenFD(int fd) {
// DefineSelf (fd);
}
*/
-
+
/* Increment the count */
ListenTransCount++;
}
commit 2147b74126c2eb8cd2883a9bfa11e39f9c24a525
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sun May 18 23:02:12 2008 -0700
New XQuartz icon thanks to Simone Karin Lehmann
(cherry picked from commit c27e0c8f3c5108192362735db8a80bf3a9a1cc3a)
diff --git a/hw/xquartz/bundle/Resources/X11.icns b/hw/xquartz/bundle/Resources/X11.icns
index d770e61..d19cc63 100644
Binary files a/hw/xquartz/bundle/Resources/X11.icns and b/hw/xquartz/bundle/Resources/X11.icns differ
More information about the xorg-commit
mailing list