XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 01:34:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

os: xtrans: drop status pointer from *Accept() functions

Browse Source 
Nobody's ever looking at this value, so no need to keep it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-12-12 13:16:34 +01:00
committed by Enrico Weigelt
parent c9d9da7cf0
commit 7389686d6d
5 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
os/Xtrans.c
View File

@@ -663,13 +663,13 @@ int _XSERVTransResetListener (XtransConnInfo ciptr)
return TRANS_RESET_NOOP; return TRANS_RESET_NOOP;
} }
XtransConnInfo _XSERVTransAccept (XtransConnInfo ciptr, int *status) XtransConnInfo _XSERVTransAccept (XtransConnInfo ciptr)
{ {
XtransConnInfo newciptr; XtransConnInfo newciptr;
prmsg (2,"Accept(%d)\n", ciptr->fd); prmsg (2,"Accept(%d)\n", ciptr->fd);
newciptr = ciptr->transptr->Accept (ciptr, status); newciptr = ciptr->transptr->Accept(ciptr);
if (newciptr) if (newciptr)
newciptr->transptr = ciptr->transptr; newciptr->transptr = ciptr->transptr;

14
os/Xtrans.h
View File

@@ -122,15 +122,6 @@ typedef struct _XtransConnInfo *XtransConnInfo;
#define TRANS_ADDR_IN_USE -2 #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 * ResetListener return values
*/ */
@@ -192,10 +183,7 @@ int _XSERVTransResetListener (
XtransConnInfo /* ciptr */ XtransConnInfo /* ciptr */
); );
XtransConnInfo _XSERVTransAccept ( XtransConnInfo _XSERVTransAccept (XtransConnInfo ciptr);
XtransConnInfo, /* ciptr */
int * /* status */
);
int _XSERVTransRead ( int _XSERVTransRead (
XtransConnInfo, /* ciptr */ XtransConnInfo, /* ciptr */

5
os/Xtransint.h
View File

@@ -165,10 +165,7 @@ typedef struct _Xtransport {
XtransConnInfo /* connection */ XtransConnInfo /* connection */
); );
XtransConnInfo (*Accept)( XtransConnInfo (*Accept)(XtransConnInfo ciptr);
XtransConnInfo, /* connection */
int * /* status */
);
int (*Read)( int (*Read)(
XtransConnInfo, /* connection */ XtransConnInfo, /* connection */

16
os/Xtranssock.c
View File

@@ -1021,7 +1021,7 @@ static int _XSERVTransSocketUNIXResetListener (XtransConnInfo ciptr)
#ifdef TCPCONN #ifdef TCPCONN
static XtransConnInfo _XSERVTransSocketINETAccept ( static XtransConnInfo _XSERVTransSocketINETAccept (
XtransConnInfo ciptr, int *status) XtransConnInfo ciptr)
{ {
XtransConnInfo newciptr; XtransConnInfo newciptr;
struct sockaddr_in sockname; struct sockaddr_in sockname;
@@ -1032,7 +1032,6 @@ static XtransConnInfo _XSERVTransSocketINETAccept (
if ((newciptr = calloc (1, sizeof(struct _XtransConnInfo))) == NULL) if ((newciptr = calloc (1, sizeof(struct _XtransConnInfo))) == NULL)
{ {
prmsg (1, "SocketINETAccept: malloc failed\n"); prmsg (1, "SocketINETAccept: malloc failed\n");
*status = TRANS_ACCEPT_BAD_MALLOC;
return NULL; return NULL;
} }
@@ -1044,7 +1043,6 @@ static XtransConnInfo _XSERVTransSocketINETAccept (
#endif #endif
prmsg (1, "SocketINETAccept: accept() failed\n"); prmsg (1, "SocketINETAccept: accept() failed\n");
free (newciptr); free (newciptr);
*status = TRANS_ACCEPT_FAILED;
return NULL; return NULL;
} }
@@ -1071,7 +1069,6 @@ static XtransConnInfo _XSERVTransSocketINETAccept (
"SocketINETAccept: ...SocketINETGetAddr() failed:\n"); "SocketINETAccept: ...SocketINETGetAddr() failed:\n");
ossock_close(newciptr->fd); ossock_close(newciptr->fd);
free (newciptr); free (newciptr);
*status = TRANS_ACCEPT_MISC_ERROR;
return NULL; return NULL;
} }
@@ -1082,12 +1079,9 @@ static XtransConnInfo _XSERVTransSocketINETAccept (
ossock_close(newciptr->fd); ossock_close(newciptr->fd);
if (newciptr->addr) free (newciptr->addr); if (newciptr->addr) free (newciptr->addr);
free (newciptr); free (newciptr);
*status = TRANS_ACCEPT_MISC_ERROR;
return NULL; return NULL;
} }
*status = 0;
return newciptr; return newciptr;
} }
@@ -1096,7 +1090,7 @@ static XtransConnInfo _XSERVTransSocketINETAccept (
#ifdef UNIXCONN #ifdef UNIXCONN
static XtransConnInfo _XSERVTransSocketUNIXAccept ( static XtransConnInfo _XSERVTransSocketUNIXAccept (
XtransConnInfo ciptr, int *status) XtransConnInfo ciptr)
{ {
XtransConnInfo newciptr; XtransConnInfo newciptr;
struct sockaddr_un sockname; struct sockaddr_un sockname;
@@ -1107,7 +1101,6 @@ static XtransConnInfo _XSERVTransSocketUNIXAccept (
if ((newciptr = calloc (1, sizeof(struct _XtransConnInfo))) == NULL) if ((newciptr = calloc (1, sizeof(struct _XtransConnInfo))) == NULL)
{ {
prmsg (1, "SocketUNIXAccept: malloc() failed\n"); prmsg (1, "SocketUNIXAccept: malloc() failed\n");
*status = TRANS_ACCEPT_BAD_MALLOC;
return NULL; return NULL;
} }
@@ -1116,7 +1109,6 @@ static XtransConnInfo _XSERVTransSocketUNIXAccept (
{ {
prmsg (1, "SocketUNIXAccept: accept() failed\n"); prmsg (1, "SocketUNIXAccept: accept() failed\n");
free (newciptr); free (newciptr);
*status = TRANS_ACCEPT_FAILED;
return NULL; return NULL;
} }
@@ -1132,7 +1124,6 @@ static XtransConnInfo _XSERVTransSocketUNIXAccept (
"SocketUNIXAccept: Can't allocate space for the addr\n"); "SocketUNIXAccept: Can't allocate space for the addr\n");
ossock_close(newciptr->fd); ossock_close(newciptr->fd);
free (newciptr); free (newciptr);
*status = TRANS_ACCEPT_BAD_MALLOC;
return NULL; return NULL;
} }
@@ -1151,7 +1142,6 @@ static XtransConnInfo _XSERVTransSocketUNIXAccept (
ossock_close(newciptr->fd); ossock_close(newciptr->fd);
if (newciptr->addr) free (newciptr->addr); if (newciptr->addr) free (newciptr->addr);
free (newciptr); free (newciptr);
*status = TRANS_ACCEPT_BAD_MALLOC;
return NULL; return NULL;
} }
@@ -1160,8 +1150,6 @@ static XtransConnInfo _XSERVTransSocketUNIXAccept (
newciptr->family = AF_UNIX; newciptr->family = AF_UNIX;
*status = 0;
return newciptr; return newciptr;
} }

4
os/connection.c
View File

@@ -621,7 +621,6 @@ EstablishNewConnections(int curconn, int ready, void *data)
ClientPtr client; ClientPtr client;
OsCommPtr oc; OsCommPtr oc;
XtransConnInfo trans_conn, new_trans_conn; XtransConnInfo trans_conn, new_trans_conn;
int status;
connect_time = GetTimeInMillis(); connect_time = GetTimeInMillis();
/* kill off stragglers */ /* kill off stragglers */
@@ -638,7 +637,7 @@ EstablishNewConnections(int curconn, int ready, void *data)
if ((trans_conn = lookup_trans_conn(curconn)) == NULL) if ((trans_conn = lookup_trans_conn(curconn)) == NULL)
return; return;
if ((new_trans_conn = _XSERVTransAccept(trans_conn, &status)) == NULL) if ((new_trans_conn = _XSERVTransAccept(trans_conn)) == NULL)
return; return;
newconn = _XSERVTransGetConnectionNumber(new_trans_conn); newconn = _XSERVTransGetConnectionNumber(new_trans_conn);
@@ -1008,7 +1007,6 @@ ListenOnOpenFD(int fd, int noxauth)
ListenTransCount++; ListenTransCount++;
} }
/* based on _XSERVTransSocketUNIXAccept (XtransConnInfo ciptr, int *status) */
Bool Bool
AddClientOnOpenFD(int fd) AddClientOnOpenFD(int fd)
{ {