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

os: xtrans: drop ifdef TRANS_SERVER 

it's always defined, no extra guards needed.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-02-12 19:44:43 +01:00
parent 1dbc9d03ac
commit 13fd772406
14 changed files with 1 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xwin/windisplay.c
View File

@ -36,7 +36,6 @@
#include "winmsg.h" #include "winmsg.h"
#define XSERV_t #define XSERV_t
#define TRANS_SERVER
#include "os/Xtrans.h" #include "os/Xtrans.h"
/* /*

28
os/Xtrans.c
View File

@ -443,9 +443,7 @@ TRANS(Open) (int type, const char *address)
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
break; break;
case XTRANS_OPEN_COTS_SERVER: case XTRANS_OPEN_COTS_SERVER:
#ifdef TRANS_SERVER
ciptr = thistrans->OpenCOTSServer(thistrans, protocol, host, port); ciptr = thistrans->OpenCOTSServer(thistrans, protocol, host, port);
#endif /* TRANS_SERVER */
break; break;
default: default:
prmsg (1,"Open: Unknown Open type %d\n", type); prmsg (1,"Open: Unknown Open type %d\n", type);
@ -564,9 +562,6 @@ TRANS(OpenCOTSClient) (const char *address)
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
XtransConnInfo XtransConnInfo
TRANS(OpenCOTSServer) (const char *address) TRANS(OpenCOTSServer) (const char *address)
@ -575,9 +570,6 @@ TRANS(OpenCOTSServer) (const char *address)
return TRANS(Open) (XTRANS_OPEN_COTS_SERVER, address); return TRANS(Open) (XTRANS_OPEN_COTS_SERVER, address);
} }
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
XtransConnInfo XtransConnInfo
@ -696,18 +688,14 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
return ret; return ret;
} }
#ifdef TRANS_SERVER
int int
TRANS(CreateListener) (XtransConnInfo ciptr, const char *port, unsigned int flags) TRANS(CreateListener) (XtransConnInfo ciptr, const char *port, unsigned int flags)
{ {
return ciptr->transptr->CreateListener (ciptr, port, flags); return ciptr->transptr->CreateListener (ciptr, port, flags);
} }
int int
TRANS(Received) (const char * protocol) TRANS(Received) (const char * protocol)
{ {
Xtransport *trans; Xtransport *trans;
int i = 0, ret = 0; int i = 0, ret = 0;
@ -735,7 +723,6 @@ TRANS(Received) (const char * protocol)
int int
TRANS(NoListen) (const char * protocol) TRANS(NoListen) (const char * protocol)
{ {
Xtransport *trans; Xtransport *trans;
int i = 0, ret = 0; int i = 0, ret = 0;
@ -802,7 +789,6 @@ TRANS(IsListening) (const char * protocol)
int int
TRANS(ResetListener) (XtransConnInfo ciptr) TRANS(ResetListener) (XtransConnInfo ciptr)
{ {
if (ciptr->transptr->ResetListener) if (ciptr->transptr->ResetListener)
return ciptr->transptr->ResetListener (ciptr); return ciptr->transptr->ResetListener (ciptr);
@ -810,10 +796,8 @@ TRANS(ResetListener) (XtransConnInfo ciptr)
return TRANS_RESET_NOOP; return TRANS_RESET_NOOP;
} }
XtransConnInfo XtransConnInfo
TRANS(Accept) (XtransConnInfo ciptr, int *status) TRANS(Accept) (XtransConnInfo ciptr, int *status)
{ {
XtransConnInfo newciptr; XtransConnInfo newciptr;
@ -827,9 +811,6 @@ TRANS(Accept) (XtransConnInfo ciptr, int *status)
return newciptr; return newciptr;
} }
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
int int
@ -996,18 +977,13 @@ TRANS(GetConnectionNumber) (XtransConnInfo ciptr)
return ciptr->fd; return ciptr->fd;
} }
/* /*
* These functions are really utility functions, but they require knowledge * These functions are really utility functions, but they require knowledge
* of the internal data structures, so they have to be part of the Transport * of the internal data structures, so they have to be part of the Transport
* Independent API. * Independent API.
*/ */
#ifdef TRANS_SERVER
static int static int
complete_network_count (void) complete_network_count (void)
{ {
int count = 0; int count = 0;
int found_local = 0; int found_local = 0;
@ -1245,10 +1221,6 @@ TRANS(MakeAllCOTSServerListeners) (const char *port, int *partial,
return 0; return 0;
} }
#endif /* TRANS_SERVER */
/* /*
* These routines are not part of the X Transport Interface, but they * These routines are not part of the X Transport Interface, but they
* may be used by it. * may be used by it.

13
os/Xtrans.h
View File

@ -205,14 +205,10 @@ XtransConnInfo TRANS(OpenCOTSClient)(
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
XtransConnInfo TRANS(OpenCOTSServer)( XtransConnInfo TRANS(OpenCOTSServer)(
const char * /* address */ const char * /* address */
); );
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
XtransConnInfo TRANS(ReopenCOTSServer)( XtransConnInfo TRANS(ReopenCOTSServer)(
@ -237,8 +233,6 @@ int TRANS(SetOption)(
int /* arg */ int /* arg */
); );
#ifdef TRANS_SERVER
int TRANS(CreateListener)( int TRANS(CreateListener)(
XtransConnInfo, /* ciptr */ XtransConnInfo, /* ciptr */
const char *, /* port */ const char *, /* port */
@ -270,8 +264,6 @@ XtransConnInfo TRANS(Accept)(
int * /* status */ int * /* status */
); );
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
int TRANS(Connect)( int TRANS(Connect)(
@ -341,8 +333,6 @@ int TRANS(GetConnectionNumber)(
XtransConnInfo /* ciptr */ XtransConnInfo /* ciptr */
); );
#ifdef TRANS_SERVER
int TRANS(MakeAllCOTSServerListeners)( int TRANS(MakeAllCOTSServerListeners)(
const char *, /* port */ const char *, /* port */
int *, /* partial */ int *, /* partial */
@ -350,9 +340,6 @@ int TRANS(MakeAllCOTSServerListeners)(
XtransConnInfo ** /* ciptrs_ret */ XtransConnInfo ** /* ciptrs_ret */
); );
#endif /* TRANS_SERVER */
/* /*
* Function Prototypes for Utility Functions. * Function Prototypes for Utility Functions.
*/ */

8
os/Xtransint.h
View File

@ -146,7 +146,6 @@ typedef struct _Xtransport {
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
const char ** nolisten; const char ** nolisten;
XtransConnInfo (*OpenCOTSServer)( XtransConnInfo (*OpenCOTSServer)(
struct _Xtransport *, /* transport */ struct _Xtransport *, /* transport */
@ -155,8 +154,6 @@ typedef struct _Xtransport {
const char * /* port */ const char * /* port */
); );
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
XtransConnInfo (*ReopenCOTSServer)( XtransConnInfo (*ReopenCOTSServer)(
@ -174,7 +171,6 @@ typedef struct _Xtransport {
int /* arg */ int /* arg */
); );
#ifdef TRANS_SERVER
/* Flags */ /* Flags */
# define ADDR_IN_USE_ALLOWED 1 # define ADDR_IN_USE_ALLOWED 1
@ -193,8 +189,6 @@ typedef struct _Xtransport {
int * /* status */ int * /* status */
); );
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
int (*Connect)( int (*Connect)(
@ -332,12 +326,10 @@ static int TRANS(WriteV)(
#endif /* WIN32 */ #endif /* WIN32 */
#ifdef TRANS_SERVER
static int trans_mkdir ( static int trans_mkdir (
const char *, /* path */ const char *, /* path */
int /* mode */ int /* mode */
); );
#endif
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic pop #pragma clang diagnostic pop

74
os/Xtranslcl.c
View File

@ -297,10 +297,6 @@ TRANS(NAMEDOpenClient)(XtransConnInfo ciptr, const char *port)
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
#ifdef NAMEDNODENAME #ifdef NAMEDNODENAME
static int static int
TRANS(NAMEDOpenPipe)(const char *server_path) TRANS(NAMEDOpenPipe)(const char *server_path)
@ -484,8 +480,6 @@ TRANS(NAMEDAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
return str.fd; return str.fd;
} }
#endif /* TRANS_SERVER */
#endif /* LOCAL_TRANS_NAMED */ #endif /* LOCAL_TRANS_NAMED */
@ -562,14 +556,10 @@ typedef struct _LOCALtrans2dev {
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
int (*devcotsopenserver)( int (*devcotsopenserver)(
XtransConnInfo, const char * /*port*/ XtransConnInfo, const char * /*port*/
); );
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
int (*devcltsopenclient)( int (*devcltsopenclient)(
@ -578,14 +568,10 @@ typedef struct _LOCALtrans2dev {
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
int (*devcltsopenserver)( int (*devcltsopenserver)(
XtransConnInfo, const char * /*port*/ XtransConnInfo, const char * /*port*/
); );
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
int (*devcotsreopenserver)( int (*devcotsreopenserver)(
@ -602,8 +588,6 @@ typedef struct _LOCALtrans2dev {
#endif /* TRANS_REOPEN */ #endif /* TRANS_REOPEN */
#ifdef TRANS_SERVER
int (*devreset)( int (*devreset)(
XtransConnInfo /* ciptr */ XtransConnInfo /* ciptr */
); );
@ -612,8 +596,6 @@ typedef struct _LOCALtrans2dev {
XtransConnInfo, XtransConnInfo, int * XtransConnInfo, XtransConnInfo, int *
); );
#endif /* TRANS_SERVER */
} LOCALtrans2dev; } LOCALtrans2dev;
static LOCALtrans2dev LOCALtrans2devtab[] = { static LOCALtrans2dev LOCALtrans2devtab[] = {
@ -621,46 +603,34 @@ static LOCALtrans2dev LOCALtrans2devtab[] = {
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(NAMEDOpenClient), TRANS(NAMEDOpenClient),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(NAMEDOpenServer), TRANS(NAMEDOpenServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(OpenFail), TRANS(OpenFail),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(OpenFail), TRANS(OpenFail),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
TRANS(NAMEDReopenServer), TRANS(NAMEDReopenServer),
TRANS(ReopenFail), TRANS(ReopenFail),
#endif #endif
#ifdef TRANS_SERVER
TRANS(NAMEDResetListener), TRANS(NAMEDResetListener),
TRANS(NAMEDAccept) TRANS(NAMEDAccept)
#endif /* TRANS_SERVER */
}, },
{"local", {"local",
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(NAMEDOpenClient), TRANS(NAMEDOpenClient),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(NAMEDOpenServer), TRANS(NAMEDOpenServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(OpenFail), TRANS(OpenFail),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(OpenFail), TRANS(OpenFail),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
TRANS(NAMEDReopenServer), TRANS(NAMEDReopenServer),
TRANS(ReopenFail), TRANS(ReopenFail),
#endif #endif
#ifdef TRANS_SERVER
TRANS(NAMEDResetListener), TRANS(NAMEDResetListener),
TRANS(NAMEDAccept) TRANS(NAMEDAccept)
#endif /* TRANS_SERVER */
}, },
#ifdef LOCAL_TRANS_NAMED #ifdef LOCAL_TRANS_NAMED
@ -668,46 +638,34 @@ static LOCALtrans2dev LOCALtrans2devtab[] = {
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(NAMEDOpenClient), TRANS(NAMEDOpenClient),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(NAMEDOpenServer), TRANS(NAMEDOpenServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(OpenFail), TRANS(OpenFail),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(OpenFail), TRANS(OpenFail),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
TRANS(NAMEDReopenServer), TRANS(NAMEDReopenServer),
TRANS(ReopenFail), TRANS(ReopenFail),
#endif #endif
#ifdef TRANS_SERVER
TRANS(NAMEDResetListener), TRANS(NAMEDResetListener),
TRANS(NAMEDAccept) TRANS(NAMEDAccept)
#endif /* TRANS_SERVER */
}, },
{"pipe", {"pipe",
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(NAMEDOpenClient), TRANS(NAMEDOpenClient),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(NAMEDOpenServer), TRANS(NAMEDOpenServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(OpenFail), TRANS(OpenFail),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(OpenFail), TRANS(OpenFail),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
TRANS(NAMEDReopenServer), TRANS(NAMEDReopenServer),
TRANS(ReopenFail), TRANS(ReopenFail),
#endif #endif
#ifdef TRANS_SERVER
TRANS(NAMEDResetListener), TRANS(NAMEDResetListener),
TRANS(NAMEDAccept) TRANS(NAMEDAccept)
#endif /* TRANS_SERVER */
}, },
#endif /* LOCAL_TRANS_NAMED */ #endif /* LOCAL_TRANS_NAMED */
@ -919,9 +877,6 @@ TRANS(LocalOpenClient)(int type, const char *protocol,
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
static XtransConnInfo static XtransConnInfo
TRANS(LocalOpenServer)(int type, const char *protocol, TRANS(LocalOpenServer)(int type, const char *protocol,
const char *host _X_UNUSED, const char *port) const char *host _X_UNUSED, const char *port)
@ -976,9 +931,6 @@ TRANS(LocalOpenServer)(int type, const char *protocol,
return NULL; return NULL;
} }
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
static XtransConnInfo static XtransConnInfo
@ -1042,9 +994,6 @@ TRANS(LocalOpenCOTSClient)(Xtransport *thistrans _X_UNUSED, const char *protocol
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
static XtransConnInfo static XtransConnInfo
TRANS(LocalOpenCOTSServer)(Xtransport *thistrans, const char *protocol, TRANS(LocalOpenCOTSServer)(Xtransport *thistrans, const char *protocol,
const char *host, const char *port) const char *host, const char *port)
@ -1090,8 +1039,6 @@ TRANS(LocalOpenCOTSServer)(Xtransport *thistrans, const char *protocol,
return TRANS(LocalOpenServer)(XTRANS_OPEN_COTS_SERVER, protocol, host, port); return TRANS(LocalOpenServer)(XTRANS_OPEN_COTS_SERVER, protocol, host, port);
} }
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
static XtransConnInfo static XtransConnInfo
@ -1131,9 +1078,6 @@ TRANS(LocalSetOption)(XtransConnInfo ciptr, int option, int arg)
return -1; return -1;
} }
#ifdef TRANS_SERVER
static int static int
TRANS(LocalCreateListener)(XtransConnInfo ciptr, const char *port, TRANS(LocalCreateListener)(XtransConnInfo ciptr, const char *port,
unsigned int flags _X_UNUSED) unsigned int flags _X_UNUSED)
@ -1195,9 +1139,6 @@ TRANS(LocalAccept)(XtransConnInfo ciptr, int *status)
return newciptr; return newciptr;
} }
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
static int static int
@ -1316,13 +1257,10 @@ TRANS(LocalCloseForCloning)(XtransConnInfo ciptr)
* The TransName is in lowercase, so it will never match during a normal * The TransName is in lowercase, so it will never match during a normal
* call to SelectTransport() in Xtrans.c. * call to SelectTransport() in Xtrans.c.
*/ */
#ifdef TRANS_SERVER
static const char * local_aliases[] = { static const char * local_aliases[] = {
"named", "named",
"pipe", /* compatibility with Solaris Xlib */ "pipe", /* compatibility with Solaris Xlib */
NULL }; NULL };
#endif
static Xtransport TRANS(LocalFuncs) = { static Xtransport TRANS(LocalFuncs) = {
/* Local Interface */ /* Local Interface */
@ -1331,19 +1269,15 @@ static Xtransport TRANS(LocalFuncs) = {
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(LocalOpenCOTSClient), TRANS(LocalOpenCOTSClient),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
local_aliases, local_aliases,
TRANS(LocalOpenCOTSServer), TRANS(LocalOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
TRANS(LocalReopenCOTSServer), TRANS(LocalReopenCOTSServer),
#endif #endif
TRANS(LocalSetOption), TRANS(LocalSetOption),
#ifdef TRANS_SERVER
TRANS(LocalCreateListener), TRANS(LocalCreateListener),
TRANS(LocalResetListener), TRANS(LocalResetListener),
TRANS(LocalAccept), TRANS(LocalAccept),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(LocalConnect), TRANS(LocalConnect),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
@ -1371,19 +1305,15 @@ static Xtransport TRANS(NAMEDFuncs) = {
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(LocalOpenCOTSClient), TRANS(LocalOpenCOTSClient),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
NULL, NULL,
TRANS(LocalOpenCOTSServer), TRANS(LocalOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
TRANS(LocalReopenCOTSServer), TRANS(LocalReopenCOTSServer),
#endif #endif
TRANS(LocalSetOption), TRANS(LocalSetOption),
#ifdef TRANS_SERVER
TRANS(LocalCreateListener), TRANS(LocalCreateListener),
TRANS(LocalResetListener), TRANS(LocalResetListener),
TRANS(LocalAccept), TRANS(LocalAccept),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(LocalConnect), TRANS(LocalConnect),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
@ -1408,19 +1338,15 @@ static Xtransport TRANS(PIPEFuncs) = {
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(LocalOpenCOTSClient), TRANS(LocalOpenCOTSClient),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
NULL, NULL,
TRANS(LocalOpenCOTSServer), TRANS(LocalOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
TRANS(LocalReopenCOTSServer), TRANS(LocalReopenCOTSServer),
#endif #endif
TRANS(LocalSetOption), TRANS(LocalSetOption),
#ifdef TRANS_SERVER
TRANS(LocalCreateListener), TRANS(LocalCreateListener),
TRANS(LocalResetListener), TRANS(LocalResetListener),
TRANS(LocalAccept), TRANS(LocalAccept),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(LocalConnect), TRANS(LocalConnect),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */

39
os/Xtranssock.c
View File

@ -211,9 +211,7 @@ static Sockettrans2dev Sockettrans2devtab[] = {
static int TRANS(SocketINETClose) (XtransConnInfo ciptr); static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
#endif #endif
#if (defined(TCPCONN) && \ #if (defined(TCPCONN) || defined(TRANS_REOPEN))
(defined(TRANS_SERVER) || defined(X11_t) || !defined(HAVE_GETADDRINFO))) \
|| defined(TRANS_REOPEN)
static int static int
is_numeric (const char *str) is_numeric (const char *str)
{ {
@ -592,9 +590,6 @@ TRANS(SocketOpenCOTSClient) (Xtransport *thistrans, const char *protocol,
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
static XtransConnInfo static XtransConnInfo
TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, const char *protocol, TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, const char *protocol,
const char *host, const char *port) const char *host, const char *port)
@ -664,9 +659,6 @@ TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, const char *protocol,
return ciptr; return ciptr;
} }
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
static XtransConnInfo static XtransConnInfo
@ -743,8 +735,6 @@ set_sun_path(const char *port, const char *upath, char *path, int abstract)
} }
#endif #endif
#ifdef TRANS_SERVER
static int static int
TRANS(SocketCreateListener) (XtransConnInfo ciptr, TRANS(SocketCreateListener) (XtransConnInfo ciptr,
struct sockaddr *sockname, struct sockaddr *sockname,
@ -1285,9 +1275,6 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status)
#endif /* UNIXCONN */ #endif /* UNIXCONN */
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
#ifdef TCPCONN #ifdef TCPCONN
@ -2349,7 +2336,6 @@ TRANS(SocketUNIXCloseForCloning) (XtransConnInfo ciptr)
#ifdef TCPCONN #ifdef TCPCONN
# ifdef TRANS_SERVER
static const char* tcp_nolisten[] = { static const char* tcp_nolisten[] = {
"inet", "inet",
#ifdef IPv6 #ifdef IPv6
@ -2357,7 +2343,6 @@ static const char* tcp_nolisten[] = {
#endif #endif
NULL NULL
}; };
# endif
static Xtransport TRANS(SocketTCPFuncs) = { static Xtransport TRANS(SocketTCPFuncs) = {
/* Socket Interface */ /* Socket Interface */
@ -2366,19 +2351,15 @@ static Xtransport TRANS(SocketTCPFuncs) = {
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(SocketOpenCOTSClient), TRANS(SocketOpenCOTSClient),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
tcp_nolisten, tcp_nolisten,
TRANS(SocketOpenCOTSServer), TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer), TRANS(SocketReopenCOTSServer),
#endif #endif
TRANS(SocketSetOption), TRANS(SocketSetOption),
#ifdef TRANS_SERVER
TRANS(SocketINETCreateListener), TRANS(SocketINETCreateListener),
NULL, /* ResetListener */ NULL, /* ResetListener */
TRANS(SocketINETAccept), TRANS(SocketINETAccept),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(SocketINETConnect), TRANS(SocketINETConnect),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
@ -2403,19 +2384,15 @@ static Xtransport TRANS(SocketINETFuncs) = {
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(SocketOpenCOTSClient), TRANS(SocketOpenCOTSClient),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
NULL, NULL,
TRANS(SocketOpenCOTSServer), TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer), TRANS(SocketReopenCOTSServer),
#endif #endif
TRANS(SocketSetOption), TRANS(SocketSetOption),
#ifdef TRANS_SERVER
TRANS(SocketINETCreateListener), TRANS(SocketINETCreateListener),
NULL, /* ResetListener */ NULL, /* ResetListener */
TRANS(SocketINETAccept), TRANS(SocketINETAccept),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(SocketINETConnect), TRANS(SocketINETConnect),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
@ -2441,19 +2418,15 @@ static Xtransport TRANS(SocketINET6Funcs) = {
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(SocketOpenCOTSClient), TRANS(SocketOpenCOTSClient),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
NULL, NULL,
TRANS(SocketOpenCOTSServer), TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer), TRANS(SocketReopenCOTSServer),
#endif #endif
TRANS(SocketSetOption), TRANS(SocketSetOption),
#ifdef TRANS_SERVER
TRANS(SocketINETCreateListener), TRANS(SocketINETCreateListener),
NULL, /* ResetListener */ NULL, /* ResetListener */
TRANS(SocketINETAccept), TRANS(SocketINETAccept),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(SocketINETConnect), TRANS(SocketINETConnect),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
@ -2486,19 +2459,15 @@ static Xtransport TRANS(SocketLocalFuncs) = {
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(SocketOpenCOTSClient), TRANS(SocketOpenCOTSClient),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
NULL, NULL,
TRANS(SocketOpenCOTSServer), TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer), TRANS(SocketReopenCOTSServer),
#endif #endif
TRANS(SocketSetOption), TRANS(SocketSetOption),
#ifdef TRANS_SERVER
TRANS(SocketUNIXCreateListener), TRANS(SocketUNIXCreateListener),
TRANS(SocketUNIXResetListener), TRANS(SocketUNIXResetListener),
TRANS(SocketUNIXAccept), TRANS(SocketUNIXAccept),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(SocketUNIXConnect), TRANS(SocketUNIXConnect),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
@ -2516,11 +2485,9 @@ static Xtransport TRANS(SocketLocalFuncs) = {
TRANS(SocketUNIXCloseForCloning), TRANS(SocketUNIXCloseForCloning),
}; };
#endif /* !LOCALCONN */ #endif /* !LOCALCONN */
# ifdef TRANS_SERVER
# if !defined(LOCALCONN) # if !defined(LOCALCONN)
static const char* unix_nolisten[] = { "local" , NULL }; static const char* unix_nolisten[] = { "local" , NULL };
# endif # endif
# endif
static Xtransport TRANS(SocketUNIXFuncs) = { static Xtransport TRANS(SocketUNIXFuncs) = {
/* Socket Interface */ /* Socket Interface */
@ -2533,23 +2500,19 @@ static Xtransport TRANS(SocketUNIXFuncs) = {
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(SocketOpenCOTSClient), TRANS(SocketOpenCOTSClient),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
#if !defined(LOCALCONN) #if !defined(LOCALCONN)
unix_nolisten, unix_nolisten,
#else #else
NULL, NULL,
#endif #endif
TRANS(SocketOpenCOTSServer), TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN #ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer), TRANS(SocketReopenCOTSServer),
#endif #endif
TRANS(SocketSetOption), TRANS(SocketSetOption),
#ifdef TRANS_SERVER
TRANS(SocketUNIXCreateListener), TRANS(SocketUNIXCreateListener),
TRANS(SocketUNIXResetListener), TRANS(SocketUNIXResetListener),
TRANS(SocketUNIXAccept), TRANS(SocketUNIXAccept),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT #ifdef TRANS_CLIENT
TRANS(SocketUNIXConnect), TRANS(SocketUNIXConnect),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */

3
os/Xtransutil.c
View File

@ -240,7 +240,6 @@ TRANS(WSAStartup) (void)
} }
#endif #endif
#ifdef TRANS_SERVER
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>
@ -427,5 +426,3 @@ trans_mkdir(const char *path, int mode)
/* In all other cases, fail */ /* In all other cases, fail */
return -1; return -1;
} }
#endif /* TRANS_SERVER */

1
os/access.c
View File

@ -85,7 +85,6 @@ SOFTWARE.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#define XSERV_t #define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include "os/Xtrans.h" #include "os/Xtrans.h"
#include <X11/Xauth.h> #include <X11/Xauth.h>

1
os/connection.c
View File

@ -68,7 +68,6 @@ SOFTWARE.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#define XSERV_t #define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include "os/Xtrans.h" #include "os/Xtrans.h"
#include "os/Xtransint.h" #include "os/Xtransint.h"

1
os/io.c
View File

@ -62,7 +62,6 @@ SOFTWARE.
#endif #endif
#include <stdio.h> #include <stdio.h>
#define XSERV_t #define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include "os/Xtrans.h" #include "os/Xtrans.h"
#include <X11/Xmd.h> #include <X11/Xmd.h>

1
os/utils.c
View File

@ -63,7 +63,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include "misc.h" #include "misc.h"
#include <X11/X.h> #include <X11/X.h>
#define XSERV_t #define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include "os/Xtrans.h" #include "os/Xtrans.h"

1
os/xdmauth.c
View File

@ -38,7 +38,6 @@ from The Open Group.
#include <stdio.h> #include <stdio.h>
#include <X11/X.h> #include <X11/X.h>
#define XSERV_t #define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include "os/auth.h" #include "os/auth.h"

2
os/xdmcp.c
View File

@ -18,7 +18,6 @@
#ifdef WIN32 #ifdef WIN32
#include <X11/Xwinsock.h> #include <X11/Xwinsock.h>
#define XSERV_t #define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include "os/Xtrans.h" #include "os/Xtrans.h"
#endif #endif
@ -49,7 +48,6 @@
#include "dixstruct.h" #include "dixstruct.h"
#define XSERV_t #define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include "os/Xtrans.h" #include "os/Xtrans.h"

1
os/xstrans.c
View File

@ -3,6 +3,5 @@
#include <X11/Xfuncproto.h> #include <X11/Xfuncproto.h>
#define TRANS_REOPEN #define TRANS_REOPEN
#define TRANS_SERVER
#define XSERV_t #define XSERV_t
#include "os/transport.c" #include "os/transport.c"