diff options
Diffstat (limited to 'nx-X11/lib/xtrans/Xtranslcl.c')
| -rw-r--r-- | nx-X11/lib/xtrans/Xtranslcl.c | 103 |
1 files changed, 1 insertions, 102 deletions
diff --git a/nx-X11/lib/xtrans/Xtranslcl.c b/nx-X11/lib/xtrans/Xtranslcl.c index 74a5c5673..cf11cc2fa 100644 --- a/nx-X11/lib/xtrans/Xtranslcl.c +++ b/nx-X11/lib/xtrans/Xtranslcl.c @@ -2041,11 +2041,7 @@ TRANS(LocalOpenClient)(int type, char *protocol, char *host, char *port) case XTRANS_OPEN_COTS_CLIENT: ciptr->fd=transptr->devcotsopenclient(ciptr,port); break; - case XTRANS_OPEN_CLTS_CLIENT: - ciptr->fd=transptr->devcltsopenclient(ciptr,port); - break; case XTRANS_OPEN_COTS_SERVER: - case XTRANS_OPEN_CLTS_SERVER: prmsg(1, "LocalOpenClient: Should not be opening a server with this function\n"); break; @@ -2109,16 +2105,12 @@ TRANS(LocalOpenServer)(int type, char *protocol, char *host, char *port) switch( type ) { case XTRANS_OPEN_COTS_CLIENT: - case XTRANS_OPEN_CLTS_CLIENT: prmsg(1, "LocalOpenServer: Should not be opening a client with this function\n"); break; case XTRANS_OPEN_COTS_SERVER: ciptr->fd=LOCALtrans2devtab[i].devcotsopenserver(ciptr,port); break; - case XTRANS_OPEN_CLTS_SERVER: - ciptr->fd=LOCALtrans2devtab[i].devcltsopenserver(ciptr,port); - break; default: prmsg(1,"LocalOpenServer: Unknown Open type %d\n", type ); @@ -2163,10 +2155,7 @@ TRANS(LocalReopenServer)(int type, int index, int fd, char *port) case XTRANS_OPEN_COTS_SERVER: stat = LOCALtrans2devtab[index].devcotsreopenserver(ciptr,fd,port); break; - case XTRANS_OPEN_CLTS_SERVER: - stat = LOCALtrans2devtab[index].devcltsreopenserver(ciptr,fd,port); - break; - default: + default: prmsg(1,"LocalReopenServer: Unknown Open type %d\n", type ); } @@ -2248,37 +2237,6 @@ TRANS(LocalOpenCOTSServer)(Xtransport *thistrans, char *protocol, #endif /* TRANS_SERVER */ - -#ifdef TRANS_CLIENT - -static XtransConnInfo -TRANS(LocalOpenCLTSClient)(Xtransport *thistrans, char *protocol, - char *host, char *port) - -{ - prmsg(2,"LocalOpenCLTSClient(%s,%s,%s)\n",protocol,host,port); - - return TRANS(LocalOpenClient)(XTRANS_OPEN_CLTS_CLIENT, protocol, host, port); -} - -#endif /* TRANS_CLIENT */ - - -#ifdef TRANS_SERVER - -static XtransConnInfo -TRANS(LocalOpenCLTSServer)(Xtransport *thistrans, char *protocol, - char *host, char *port) - -{ - prmsg(2,"LocalOpenCLTSServer(%s,%s,%s)\n",protocol,host,port); - - return TRANS(LocalOpenServer)(XTRANS_OPEN_CLTS_SERVER, protocol, host, port); -} - -#endif /* TRANS_SERVER */ - - #ifdef TRANS_REOPEN static XtransConnInfo @@ -2305,30 +2263,6 @@ TRANS(LocalReopenCOTSServer)(Xtransport *thistrans, int fd, char *port) index, fd, port); } -static XtransConnInfo -TRANS(LocalReopenCLTSServer)(Xtransport *thistrans, int fd, char *port) - -{ - int index; - - prmsg(2,"LocalReopenCLTSServer(%d,%s)\n", fd, port); - - for(index=1;index<NUMTRANSPORTS;index++) - { - if( strcmp(thistrans->TransName, - LOCALtrans2devtab[index].transname) == 0 ) - break; - } - - if (index >= NUMTRANSPORTS) - { - return (NULL); - } - - return TRANS(LocalReopenServer)(XTRANS_OPEN_CLTS_SERVER, - index, fd, port); -} - #endif /* TRANS_REOPEN */ @@ -2539,15 +2473,8 @@ Xtransport TRANS(LocalFuncs) = { local_aliases, TRANS(LocalOpenCOTSServer), #endif /* TRANS_SERVER */ -#ifdef TRANS_CLIENT - TRANS(LocalOpenCLTSClient), -#endif /* TRANS_CLIENT */ -#ifdef TRANS_SERVER - TRANS(LocalOpenCLTSServer), -#endif /* TRANS_SERVER */ #ifdef TRANS_REOPEN TRANS(LocalReopenCOTSServer), - TRANS(LocalReopenCLTSServer), #endif TRANS(LocalSetOption), #ifdef TRANS_SERVER @@ -2581,15 +2508,8 @@ Xtransport TRANS(PTSFuncs) = { NULL, TRANS(LocalOpenCOTSServer), #endif /* TRANS_SERVER */ -#ifdef TRANS_CLIENT - TRANS(LocalOpenCLTSClient), -#endif /* TRANS_CLIENT */ -#ifdef TRANS_SERVER - TRANS(LocalOpenCLTSServer), -#endif /* TRANS_SERVER */ #ifdef TRANS_REOPEN TRANS(LocalReopenCOTSServer), - TRANS(LocalReopenCLTSServer), #endif TRANS(LocalSetOption), #ifdef TRANS_SERVER @@ -2623,15 +2543,8 @@ Xtransport TRANS(NAMEDFuncs) = { NULL, TRANS(LocalOpenCOTSServer), #endif /* TRANS_SERVER */ -#ifdef TRANS_CLIENT - TRANS(LocalOpenCLTSClient), -#endif /* TRANS_CLIENT */ -#ifdef TRANS_SERVER - TRANS(LocalOpenCLTSServer), -#endif /* TRANS_SERVER */ #ifdef TRANS_REOPEN TRANS(LocalReopenCOTSServer), - TRANS(LocalReopenCLTSServer), #endif TRANS(LocalSetOption), #ifdef TRANS_SERVER @@ -2665,15 +2578,8 @@ Xtransport TRANS(ISCFuncs) = { NULL, TRANS(LocalOpenCOTSServer), #endif /* TRANS_SERVER */ -#ifdef TRANS_CLIENT - TRANS(LocalOpenCLTSClient), -#endif /* TRANS_CLIENT */ -#ifdef TRANS_SERVER - TRANS(LocalOpenCLTSServer), -#endif /* TRANS_SERVER */ #ifdef TRANS_REOPEN TRANS(LocalReopenCOTSServer), - TRANS(LocalReopenCLTSServer), #endif TRANS(LocalSetOption), #ifdef TRANS_SERVER @@ -2705,15 +2611,8 @@ Xtransport TRANS(SCOFuncs) = { NULL, TRANS(LocalOpenCOTSServer), #endif /* TRANS_SERVER */ -#ifdef TRANS_CLIENT - TRANS(LocalOpenCLTSClient), -#endif /* TRANS_CLIENT */ -#ifdef TRANS_SERVER - TRANS(LocalOpenCLTSServer), -#endif /* TRANS_SERVER */ #ifdef TRANS_REOPEN TRANS(LocalReopenCOTSServer), - TRANS(LocalReopenCLTSServer), #endif TRANS(LocalSetOption), #ifdef TRANS_SERVER |