From 7389686d6d827cf52d52d528aae0c3e0a13f29ac Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 12 Dec 2025 13:16:34 +0100 Subject: [PATCH] os: xtrans: drop status pointer from *Accept() functions Nobody's ever looking at this value, so no need to keep it. Signed-off-by: Enrico Weigelt, metux IT consult --- os/Xtrans.c | 4 ++-- os/Xtrans.h | 14 +------------- os/Xtransint.h | 5 +---- os/Xtranssock.c | 16 ++-------------- os/connection.c | 4 +--- 5 files changed, 7 insertions(+), 36 deletions(-) diff --git a/os/Xtrans.c b/os/Xtrans.c index fe947309eb..2e6cde4486 100644 --- a/os/Xtrans.c +++ b/os/Xtrans.c @@ -663,13 +663,13 @@ int _XSERVTransResetListener (XtransConnInfo ciptr) return TRANS_RESET_NOOP; } -XtransConnInfo _XSERVTransAccept (XtransConnInfo ciptr, int *status) +XtransConnInfo _XSERVTransAccept (XtransConnInfo ciptr) { XtransConnInfo newciptr; prmsg (2,"Accept(%d)\n", ciptr->fd); - newciptr = ciptr->transptr->Accept (ciptr, status); + newciptr = ciptr->transptr->Accept(ciptr); if (newciptr) newciptr->transptr = ciptr->transptr; diff --git a/os/Xtrans.h b/os/Xtrans.h index a7f2e9b9ed..db2cdea8d5 100644 --- a/os/Xtrans.h +++ b/os/Xtrans.h @@ -122,15 +122,6 @@ typedef struct _XtransConnInfo *XtransConnInfo; #define TRANS_ADDR_IN_USE -2 -/* - * Return values of Accept (0 is success) - */ - -#define TRANS_ACCEPT_BAD_MALLOC -1 -#define TRANS_ACCEPT_FAILED -2 -#define TRANS_ACCEPT_MISC_ERROR -3 - - /* * ResetListener return values */ @@ -192,10 +183,7 @@ int _XSERVTransResetListener ( XtransConnInfo /* ciptr */ ); -XtransConnInfo _XSERVTransAccept ( - XtransConnInfo, /* ciptr */ - int * /* status */ -); +XtransConnInfo _XSERVTransAccept (XtransConnInfo ciptr); int _XSERVTransRead ( XtransConnInfo, /* ciptr */ diff --git a/os/Xtransint.h b/os/Xtransint.h index 489e909491..4c167ee5cb 100644 --- a/os/Xtransint.h +++ b/os/Xtransint.h @@ -165,10 +165,7 @@ typedef struct _Xtransport { XtransConnInfo /* connection */ ); - XtransConnInfo (*Accept)( - XtransConnInfo, /* connection */ - int * /* status */ - ); + XtransConnInfo (*Accept)(XtransConnInfo ciptr); int (*Read)( XtransConnInfo, /* connection */ diff --git a/os/Xtranssock.c b/os/Xtranssock.c index 18e563ca53..820c3dfcd9 100644 --- a/os/Xtranssock.c +++ b/os/Xtranssock.c @@ -1021,7 +1021,7 @@ static int _XSERVTransSocketUNIXResetListener (XtransConnInfo ciptr) #ifdef TCPCONN static XtransConnInfo _XSERVTransSocketINETAccept ( - XtransConnInfo ciptr, int *status) + XtransConnInfo ciptr) { XtransConnInfo newciptr; struct sockaddr_in sockname; @@ -1032,7 +1032,6 @@ static XtransConnInfo _XSERVTransSocketINETAccept ( if ((newciptr = calloc (1, sizeof(struct _XtransConnInfo))) == NULL) { prmsg (1, "SocketINETAccept: malloc failed\n"); - *status = TRANS_ACCEPT_BAD_MALLOC; return NULL; } @@ -1044,7 +1043,6 @@ static XtransConnInfo _XSERVTransSocketINETAccept ( #endif prmsg (1, "SocketINETAccept: accept() failed\n"); free (newciptr); - *status = TRANS_ACCEPT_FAILED; return NULL; } @@ -1071,7 +1069,6 @@ static XtransConnInfo _XSERVTransSocketINETAccept ( "SocketINETAccept: ...SocketINETGetAddr() failed:\n"); ossock_close(newciptr->fd); free (newciptr); - *status = TRANS_ACCEPT_MISC_ERROR; return NULL; } @@ -1082,12 +1079,9 @@ static XtransConnInfo _XSERVTransSocketINETAccept ( ossock_close(newciptr->fd); if (newciptr->addr) free (newciptr->addr); free (newciptr); - *status = TRANS_ACCEPT_MISC_ERROR; return NULL; } - *status = 0; - return newciptr; } @@ -1096,7 +1090,7 @@ static XtransConnInfo _XSERVTransSocketINETAccept ( #ifdef UNIXCONN static XtransConnInfo _XSERVTransSocketUNIXAccept ( - XtransConnInfo ciptr, int *status) + XtransConnInfo ciptr) { XtransConnInfo newciptr; struct sockaddr_un sockname; @@ -1107,7 +1101,6 @@ static XtransConnInfo _XSERVTransSocketUNIXAccept ( if ((newciptr = calloc (1, sizeof(struct _XtransConnInfo))) == NULL) { prmsg (1, "SocketUNIXAccept: malloc() failed\n"); - *status = TRANS_ACCEPT_BAD_MALLOC; return NULL; } @@ -1116,7 +1109,6 @@ static XtransConnInfo _XSERVTransSocketUNIXAccept ( { prmsg (1, "SocketUNIXAccept: accept() failed\n"); free (newciptr); - *status = TRANS_ACCEPT_FAILED; return NULL; } @@ -1132,7 +1124,6 @@ static XtransConnInfo _XSERVTransSocketUNIXAccept ( "SocketUNIXAccept: Can't allocate space for the addr\n"); ossock_close(newciptr->fd); free (newciptr); - *status = TRANS_ACCEPT_BAD_MALLOC; return NULL; } @@ -1151,7 +1142,6 @@ static XtransConnInfo _XSERVTransSocketUNIXAccept ( ossock_close(newciptr->fd); if (newciptr->addr) free (newciptr->addr); free (newciptr); - *status = TRANS_ACCEPT_BAD_MALLOC; return NULL; } @@ -1160,8 +1150,6 @@ static XtransConnInfo _XSERVTransSocketUNIXAccept ( newciptr->family = AF_UNIX; - *status = 0; - return newciptr; } diff --git a/os/connection.c b/os/connection.c index b44d1cc97b..3fc84dfb68 100644 --- a/os/connection.c +++ b/os/connection.c @@ -621,7 +621,6 @@ EstablishNewConnections(int curconn, int ready, void *data) ClientPtr client; OsCommPtr oc; XtransConnInfo trans_conn, new_trans_conn; - int status; connect_time = GetTimeInMillis(); /* kill off stragglers */ @@ -638,7 +637,7 @@ EstablishNewConnections(int curconn, int ready, void *data) if ((trans_conn = lookup_trans_conn(curconn)) == NULL) return; - if ((new_trans_conn = _XSERVTransAccept(trans_conn, &status)) == NULL) + if ((new_trans_conn = _XSERVTransAccept(trans_conn)) == NULL) return; newconn = _XSERVTransGetConnectionNumber(new_trans_conn); @@ -1008,7 +1007,6 @@ ListenOnOpenFD(int fd, int noxauth) ListenTransCount++; } -/* based on _XSERVTransSocketUNIXAccept (XtransConnInfo ciptr, int *status) */ Bool AddClientOnOpenFD(int fd) {