frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Cleaned up ListenOnOpenFD... 

(cherry picked from commit 6fb587d3d5fbbaee9e46cdce24d03e5d1c66d58a)
This commit is contained in:
Jeremy Huddleston 2008-05-18 23:31:41 -07:00
parent 738672858d
commit e997df8cd3
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xquartz/darwinEvents.c
View File

@ -220,7 +220,6 @@ static void kXquartzListenOnOpenFDHandler(int screenNum, xEventPtr xe, DeviceInt
TA_SERVER(); TA_SERVER();
for (i=0; i<nevents; i++) { for (i=0; i<nevents; i++) {
//sleep(20);
ListenOnOpenFD(xe[i].u.clientMessage.u.l.longs0); ListenOnOpenFD(xe[i].u.clientMessage.u.l.longs0);
} }
} }

35
os/connection.c
View File

@ -1301,8 +1301,7 @@ MakeClientGrabPervious(ClientPtr client)
/* Add a fd (from launchd) to our listeners */ /* Add a fd (from launchd) to our listeners */
_X_EXPORT void ListenOnOpenFD(int fd) { _X_EXPORT void ListenOnOpenFD(int fd) {
char port[20]; char port[20];
XtransConnInfo ciptr, *ciptr2, *ciptr3; XtransConnInfo ciptr;
int *iptr, *iptr2;
/* Sigh for inconsistencies. */ /* Sigh for inconsistencies. */
sprintf (port, ":%d", atoi(display)); sprintf (port, ":%d", atoi(display));
@ -1312,37 +1311,13 @@ _X_EXPORT void ListenOnOpenFD(int fd) {
*/ */
ciptr = _XSERVTransReopenCOTSServer(5, fd, port); ciptr = _XSERVTransReopenCOTSServer(5, fd, port);
if(ciptr == NULL) { 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; return;
} }
/* Allocate space to store it */ /* Allocate space to store it */
iptr = (int *) realloc(ListenTransFds, (ListenTransCount + 1) * sizeof (int)); ListenTransFds = (int *) xrealloc(ListenTransFds, (ListenTransCount + 1) * sizeof (int));
ListenTransConns = (XtransConnInfo *) xrealloc(ListenTransConns, (ListenTransCount + 1) * sizeof (XtransConnInfo));
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);
}
/* Store it */ /* Store it */
ListenTransConns[ListenTransCount] = ciptr; ListenTransConns[ListenTransCount] = ciptr;
@ -1355,7 +1330,7 @@ _X_EXPORT void ListenOnOpenFD(int fd) {
// DefineSelf (fd); // DefineSelf (fd);
} }
*/ */
/* Increment the count */ /* Increment the count */
ListenTransCount++; ListenTransCount++;
} }