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

os: xtrans: drop ifdef TRANS_REOPEN 

It's always defined, so the guards aren't necessary.

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:49:00 +01:00
parent 13fd772406
commit f6dd15f8d4
12 changed files with 0 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os/Xtrans.c
View File

@ -471,9 +471,6 @@ TRANS(Open) (int type, const char *address)
return ciptr; return ciptr;
} }
#ifdef TRANS_REOPEN
/* /*
* We might want to create an XtransConnInfo object based on a previously * We might want to create an XtransConnInfo object based on a previously
* opened connection. For example, the font server may clone itself and * opened connection. For example, the font server may clone itself and
@ -540,10 +537,6 @@ TRANS(Reopen) (int type, int trans_id, int fd, const char *port)
return ciptr; return ciptr;
} }
#endif /* TRANS_REOPEN */
/* /*
* These are the public interfaces to this Transport interface. * These are the public interfaces to this Transport interface.
* These are the only functions that should have knowledge of the transport * These are the only functions that should have knowledge of the transport
@ -570,8 +563,6 @@ TRANS(OpenCOTSServer) (const char *address)
return TRANS(Open) (XTRANS_OPEN_COTS_SERVER, address); return TRANS(Open) (XTRANS_OPEN_COTS_SERVER, address);
} }
#ifdef TRANS_REOPEN
XtransConnInfo XtransConnInfo
TRANS(ReopenCOTSServer) (int trans_id, int fd, const char *port) TRANS(ReopenCOTSServer) (int trans_id, int fd, const char *port)
@ -602,9 +593,6 @@ TRANS(GetReopenInfo) (XtransConnInfo ciptr,
return 0; return 0;
} }
#endif /* TRANS_REOPEN */
int int
TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg) TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)

5
os/Xtrans.h
View File

@ -209,8 +209,6 @@ XtransConnInfo TRANS(OpenCOTSServer)(
const char * /* address */ const char * /* address */
); );
#ifdef TRANS_REOPEN
XtransConnInfo TRANS(ReopenCOTSServer)( XtransConnInfo TRANS(ReopenCOTSServer)(
int, /* trans_id */ int, /* trans_id */
int, /* fd */ int, /* fd */
@ -224,9 +222,6 @@ int TRANS(GetReopenInfo)(
char ** /* port */ char ** /* port */
); );
#endif /* TRANS_REOPEN */
int TRANS(SetOption)( int TRANS(SetOption)(
XtransConnInfo, /* ciptr */ XtransConnInfo, /* ciptr */
int, /* option */ int, /* option */

5
os/Xtransint.h
View File

@ -154,17 +154,12 @@ typedef struct _Xtransport {
const char * /* port */ const char * /* port */
); );
#ifdef TRANS_REOPEN
XtransConnInfo (*ReopenCOTSServer)( XtransConnInfo (*ReopenCOTSServer)(
struct _Xtransport *, /* transport */ struct _Xtransport *, /* transport */
int, /* fd */ int, /* fd */
const char * /* port */ const char * /* port */
); );
#endif /* TRANS_REOPEN */
int (*SetOption)( int (*SetOption)(
XtransConnInfo, /* connection */ XtransConnInfo, /* connection */
int, /* option */ int, /* option */

53
os/Xtranslcl.c
View File

@ -116,8 +116,6 @@ TRANS(OpenFail)(XtransConnInfo ciptr _X_UNUSED, const char *port _X_UNUSED)
return -1; return -1;
} }
#ifdef TRANS_REOPEN
static int static int
TRANS(ReopenFail)(XtransConnInfo ciptr _X_UNUSED, int fd _X_UNUSED, TRANS(ReopenFail)(XtransConnInfo ciptr _X_UNUSED, int fd _X_UNUSED,
const char *port _X_UNUSED) const char *port _X_UNUSED)
@ -126,8 +124,6 @@ TRANS(ReopenFail)(XtransConnInfo ciptr _X_UNUSED, int fd _X_UNUSED,
return 0; return 0;
} }
#endif /* TRANS_REOPEN */
#if XTRANS_SEND_FDS #if XTRANS_SEND_FDS
static int static int
TRANS(LocalRecvFdInvalid)(XtransConnInfo ciptr) TRANS(LocalRecvFdInvalid)(XtransConnInfo ciptr)
@ -482,17 +478,6 @@ TRANS(NAMEDAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
#endif /* LOCAL_TRANS_NAMED */ #endif /* LOCAL_TRANS_NAMED */
#ifdef TRANS_REOPEN
#ifdef LOCAL_TRANS_NAMED #ifdef LOCAL_TRANS_NAMED
static int static int
@ -534,12 +519,6 @@ TRANS(NAMEDReopenServer)(XtransConnInfo ciptr, int fd _X_UNUSED, const char *por
#endif /* LOCAL_TRANS_NAMED */ #endif /* LOCAL_TRANS_NAMED */
#endif /* TRANS_REOPEN */
/* /*
* This table contains all of the entry points for the different local * This table contains all of the entry points for the different local
* connection mechanisms. * connection mechanisms.
@ -572,8 +551,6 @@ typedef struct _LOCALtrans2dev {
XtransConnInfo, const char * /*port*/ XtransConnInfo, const char * /*port*/
); );
#ifdef TRANS_REOPEN
int (*devcotsreopenserver)( int (*devcotsreopenserver)(
XtransConnInfo, XtransConnInfo,
int, /* fd */ int, /* fd */
@ -586,8 +563,6 @@ typedef struct _LOCALtrans2dev {
const char * /* port */ const char * /* port */
); );
#endif /* TRANS_REOPEN */
int (*devreset)( int (*devreset)(
XtransConnInfo /* ciptr */ XtransConnInfo /* ciptr */
); );
@ -608,10 +583,8 @@ static LOCALtrans2dev LOCALtrans2devtab[] = {
TRANS(OpenFail), TRANS(OpenFail),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
TRANS(OpenFail), TRANS(OpenFail),
#ifdef TRANS_REOPEN
TRANS(NAMEDReopenServer), TRANS(NAMEDReopenServer),
TRANS(ReopenFail), TRANS(ReopenFail),
#endif
TRANS(NAMEDResetListener), TRANS(NAMEDResetListener),
TRANS(NAMEDAccept) TRANS(NAMEDAccept)
}, },
@ -625,10 +598,8 @@ static LOCALtrans2dev LOCALtrans2devtab[] = {
TRANS(OpenFail), TRANS(OpenFail),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
TRANS(OpenFail), TRANS(OpenFail),
#ifdef TRANS_REOPEN
TRANS(NAMEDReopenServer), TRANS(NAMEDReopenServer),
TRANS(ReopenFail), TRANS(ReopenFail),
#endif
TRANS(NAMEDResetListener), TRANS(NAMEDResetListener),
TRANS(NAMEDAccept) TRANS(NAMEDAccept)
}, },
@ -643,10 +614,8 @@ static LOCALtrans2dev LOCALtrans2devtab[] = {
TRANS(OpenFail), TRANS(OpenFail),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
TRANS(OpenFail), TRANS(OpenFail),
#ifdef TRANS_REOPEN
TRANS(NAMEDReopenServer), TRANS(NAMEDReopenServer),
TRANS(ReopenFail), TRANS(ReopenFail),
#endif
TRANS(NAMEDResetListener), TRANS(NAMEDResetListener),
TRANS(NAMEDAccept) TRANS(NAMEDAccept)
}, },
@ -660,10 +629,8 @@ static LOCALtrans2dev LOCALtrans2devtab[] = {
TRANS(OpenFail), TRANS(OpenFail),
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
TRANS(OpenFail), TRANS(OpenFail),
#ifdef TRANS_REOPEN
TRANS(NAMEDReopenServer), TRANS(NAMEDReopenServer),
TRANS(ReopenFail), TRANS(ReopenFail),
#endif
TRANS(NAMEDResetListener), TRANS(NAMEDResetListener),
TRANS(NAMEDAccept) TRANS(NAMEDAccept)
}, },
@ -931,8 +898,6 @@ TRANS(LocalOpenServer)(int type, const char *protocol,
return NULL; return NULL;
} }
#ifdef TRANS_REOPEN
static XtransConnInfo static XtransConnInfo
TRANS(LocalReopenServer)(int type, int index, int fd, const char *port) TRANS(LocalReopenServer)(int type, int index, int fd, const char *port)
@ -972,10 +937,6 @@ TRANS(LocalReopenServer)(int type, int index, int fd, const char *port)
return NULL; return NULL;
} }
#endif /* TRANS_REOPEN */
/* /*
* This is the Local implementation of the X Transport service layer * This is the Local implementation of the X Transport service layer
*/ */
@ -1039,8 +1000,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);
} }
#ifdef TRANS_REOPEN
static XtransConnInfo static XtransConnInfo
TRANS(LocalReopenCOTSServer)(Xtransport *thistrans, int fd, const char *port) TRANS(LocalReopenCOTSServer)(Xtransport *thistrans, int fd, const char *port)
@ -1065,10 +1024,6 @@ TRANS(LocalReopenCOTSServer)(Xtransport *thistrans, int fd, const char *port)
index, fd, port); index, fd, port);
} }
#endif /* TRANS_REOPEN */
static int static int
TRANS(LocalSetOption)(XtransConnInfo ciptr, int option, int arg) TRANS(LocalSetOption)(XtransConnInfo ciptr, int option, int arg)
@ -1271,9 +1226,7 @@ static Xtransport TRANS(LocalFuncs) = {
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
local_aliases, local_aliases,
TRANS(LocalOpenCOTSServer), TRANS(LocalOpenCOTSServer),
#ifdef TRANS_REOPEN
TRANS(LocalReopenCOTSServer), TRANS(LocalReopenCOTSServer),
#endif
TRANS(LocalSetOption), TRANS(LocalSetOption),
TRANS(LocalCreateListener), TRANS(LocalCreateListener),
TRANS(LocalResetListener), TRANS(LocalResetListener),
@ -1307,9 +1260,7 @@ static Xtransport TRANS(NAMEDFuncs) = {
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
NULL, NULL,
TRANS(LocalOpenCOTSServer), TRANS(LocalOpenCOTSServer),
#ifdef TRANS_REOPEN
TRANS(LocalReopenCOTSServer), TRANS(LocalReopenCOTSServer),
#endif
TRANS(LocalSetOption), TRANS(LocalSetOption),
TRANS(LocalCreateListener), TRANS(LocalCreateListener),
TRANS(LocalResetListener), TRANS(LocalResetListener),
@ -1340,9 +1291,7 @@ static Xtransport TRANS(PIPEFuncs) = {
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
NULL, NULL,
TRANS(LocalOpenCOTSServer), TRANS(LocalOpenCOTSServer),
#ifdef TRANS_REOPEN
TRANS(LocalReopenCOTSServer), TRANS(LocalReopenCOTSServer),
#endif
TRANS(LocalSetOption), TRANS(LocalSetOption),
TRANS(LocalCreateListener), TRANS(LocalCreateListener),
TRANS(LocalResetListener), TRANS(LocalResetListener),
@ -1364,5 +1313,3 @@ static Xtransport TRANS(PIPEFuncs) = {
TRANS(LocalCloseForCloning), TRANS(LocalCloseForCloning),
}; };
#endif /* LOCAL_TRANS_NAMED */ #endif /* LOCAL_TRANS_NAMED */

23
os/Xtranssock.c
View File

@ -211,7 +211,6 @@ static Sockettrans2dev Sockettrans2devtab[] = {
static int TRANS(SocketINETClose) (XtransConnInfo ciptr); static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
#endif #endif
#if (defined(TCPCONN) || defined(TRANS_REOPEN))
static int static int
is_numeric (const char *str) is_numeric (const char *str)
{ {
@ -223,7 +222,6 @@ is_numeric (const char *str)
return (1); return (1);
} }
#endif
#ifdef UNIXCONN #ifdef UNIXCONN
@ -453,9 +451,6 @@ TRANS(SocketOpen) (int i, int type)
return ciptr; return ciptr;
} }
#ifdef TRANS_REOPEN
static XtransConnInfo static XtransConnInfo
TRANS(SocketReopen) (int i _X_UNUSED, int type, int fd, const char *port) TRANS(SocketReopen) (int i _X_UNUSED, int type, int fd, const char *port)
@ -536,9 +531,6 @@ TRANS(SocketReopen) (int i _X_UNUSED, int type, int fd, const char *port)
return ciptr; return ciptr;
} }
#endif /* TRANS_REOPEN */
/* /*
* These functions are the interface supplied in the Xtransport structure * These functions are the interface supplied in the Xtransport structure
*/ */
@ -659,8 +651,6 @@ TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, const char *protocol,
return ciptr; return ciptr;
} }
#ifdef TRANS_REOPEN
static XtransConnInfo static XtransConnInfo
TRANS(SocketReopenCOTSServer) (Xtransport *thistrans, int fd, const char *port) TRANS(SocketReopenCOTSServer) (Xtransport *thistrans, int fd, const char *port)
@ -695,9 +685,6 @@ TRANS(SocketReopenCOTSServer) (Xtransport *thistrans, int fd, const char *port)
return ciptr; return ciptr;
} }
#endif /* TRANS_REOPEN */
static int static int
TRANS(SocketSetOption) (XtransConnInfo ciptr, int option, int arg) TRANS(SocketSetOption) (XtransConnInfo ciptr, int option, int arg)
@ -2353,9 +2340,7 @@ static Xtransport TRANS(SocketTCPFuncs) = {
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
tcp_nolisten, tcp_nolisten,
TRANS(SocketOpenCOTSServer), TRANS(SocketOpenCOTSServer),
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer), TRANS(SocketReopenCOTSServer),
#endif
TRANS(SocketSetOption), TRANS(SocketSetOption),
TRANS(SocketINETCreateListener), TRANS(SocketINETCreateListener),
NULL, /* ResetListener */ NULL, /* ResetListener */
@ -2386,9 +2371,7 @@ static Xtransport TRANS(SocketINETFuncs) = {
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
NULL, NULL,
TRANS(SocketOpenCOTSServer), TRANS(SocketOpenCOTSServer),
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer), TRANS(SocketReopenCOTSServer),
#endif
TRANS(SocketSetOption), TRANS(SocketSetOption),
TRANS(SocketINETCreateListener), TRANS(SocketINETCreateListener),
NULL, /* ResetListener */ NULL, /* ResetListener */
@ -2420,9 +2403,7 @@ static Xtransport TRANS(SocketINET6Funcs) = {
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
NULL, NULL,
TRANS(SocketOpenCOTSServer), TRANS(SocketOpenCOTSServer),
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer), TRANS(SocketReopenCOTSServer),
#endif
TRANS(SocketSetOption), TRANS(SocketSetOption),
TRANS(SocketINETCreateListener), TRANS(SocketINETCreateListener),
NULL, /* ResetListener */ NULL, /* ResetListener */
@ -2461,9 +2442,7 @@ static Xtransport TRANS(SocketLocalFuncs) = {
#endif /* TRANS_CLIENT */ #endif /* TRANS_CLIENT */
NULL, NULL,
TRANS(SocketOpenCOTSServer), TRANS(SocketOpenCOTSServer),
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer), TRANS(SocketReopenCOTSServer),
#endif
TRANS(SocketSetOption), TRANS(SocketSetOption),
TRANS(SocketUNIXCreateListener), TRANS(SocketUNIXCreateListener),
TRANS(SocketUNIXResetListener), TRANS(SocketUNIXResetListener),
@ -2506,9 +2485,7 @@ static Xtransport TRANS(SocketUNIXFuncs) = {
NULL, NULL,
#endif #endif
TRANS(SocketOpenCOTSServer), TRANS(SocketOpenCOTSServer),
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer), TRANS(SocketReopenCOTSServer),
#endif
TRANS(SocketSetOption), TRANS(SocketSetOption),
TRANS(SocketUNIXCreateListener), TRANS(SocketUNIXCreateListener),
TRANS(SocketUNIXResetListener), TRANS(SocketUNIXResetListener),

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_REOPEN
#include "os/Xtrans.h" #include "os/Xtrans.h"
#include <X11/Xauth.h> #include <X11/Xauth.h>
#include <X11/X.h> #include <X11/X.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_REOPEN
#include "os/Xtrans.h" #include "os/Xtrans.h"
#include "os/Xtransint.h" #include "os/Xtransint.h"
#include <errno.h> #include <errno.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_REOPEN
#include "os/Xtrans.h" #include "os/Xtrans.h"
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <errno.h> #include <errno.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_REOPEN
#include "os/Xtrans.h" #include "os/Xtrans.h"
#include <libgen.h> #include <libgen.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_REOPEN
#include "os/auth.h" #include "os/auth.h"
#include "os/Xtrans.h" #include "os/Xtrans.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_REOPEN
#include "os/Xtrans.h" #include "os/Xtrans.h"
#endif #endif
@ -48,7 +47,6 @@
#include "dixstruct.h" #include "dixstruct.h"
#define XSERV_t #define XSERV_t
#define TRANS_REOPEN
#include "os/Xtrans.h" #include "os/Xtrans.h"
#ifdef XDMCP #ifdef XDMCP

1
os/xstrans.c
View File

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