From e1d372db7045e468ab622e5ebce792cf72e94a9e Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 22 Sep 2025 16:31:04 +0200 Subject: [PATCH] os: xtrans: drop unused _XSERVTransBytesReadable() Not used anywhere, so no need to keep it around anymore. Also dropping the BytesReadable vector, which is unused now. Signed-off-by: Enrico Weigelt, metux IT consult --- os/Xtrans.c | 5 ----- os/Xtrans.h | 11 ----------- os/Xtransint.h | 5 ----- os/Xtranslcl.c | 11 ----------- os/Xtranssock.c | 13 ------------- 5 files changed, 45 deletions(-) diff --git a/os/Xtrans.c b/os/Xtrans.c index 86db51327..15bb8faf2 100644 --- a/os/Xtrans.c +++ b/os/Xtrans.c @@ -695,11 +695,6 @@ XtransConnInfo _XSERVTransAccept (XtransConnInfo ciptr, int *status) return newciptr; } -int _XSERVTransBytesReadable (XtransConnInfo ciptr, BytesReadable_t *pend) -{ - return ciptr->transptr->BytesReadable (ciptr, pend); -} - int _XSERVTransRead (XtransConnInfo ciptr, char *buf, int size) { return ciptr->transptr->Read (ciptr, buf, size); diff --git a/os/Xtrans.h b/os/Xtrans.h index b77496328..a7f2e9b9e 100644 --- a/os/Xtrans.h +++ b/os/Xtrans.h @@ -103,12 +103,6 @@ typedef struct { } Xtransaddr; #endif -#ifdef LONG64 -typedef int BytesReadable_t; -#else -typedef long BytesReadable_t; -#endif - typedef struct _XtransConnInfo *XtransConnInfo; /* @@ -203,11 +197,6 @@ XtransConnInfo _XSERVTransAccept ( int * /* status */ ); -int _XSERVTransBytesReadable ( - XtransConnInfo, /* ciptr */ - BytesReadable_t * /* pend */ -); - int _XSERVTransRead ( XtransConnInfo, /* ciptr */ char *, /* buf */ diff --git a/os/Xtransint.h b/os/Xtransint.h index 03a47c37f..489e90949 100644 --- a/os/Xtransint.h +++ b/os/Xtransint.h @@ -170,11 +170,6 @@ typedef struct _Xtransport { int * /* status */ ); - int (*BytesReadable)( - XtransConnInfo, /* connection */ - BytesReadable_t * /* pend */ - ); - int (*Read)( XtransConnInfo, /* connection */ char *, /* buf */ diff --git a/os/Xtranslcl.c b/os/Xtranslcl.c index 89c6aaab3..cb6541118 100644 --- a/os/Xtranslcl.c +++ b/os/Xtranslcl.c @@ -739,14 +739,6 @@ static XtransConnInfo _XSERVTransLocalAccept(XtransConnInfo ciptr, int *status) return newciptr; } -static int _XSERVTransLocalBytesReadable(XtransConnInfo ciptr, BytesReadable_t *pend ) -{ - prmsg(2,"LocalBytesReadable(%p->%d,%p)\n", - (void *) ciptr, ciptr->fd, (void *) pend); - - return ioctl(ciptr->fd, FIONREAD, (char *)pend); -} - static int _XSERVTransLocalRead(XtransConnInfo ciptr, char *buf, int size) { prmsg(2,"LocalRead(%d,%p,%d)\n", ciptr->fd, (void *) buf, size ); @@ -828,7 +820,6 @@ static Xtransport _XSERVTransLocalFuncs = { _XSERVTransLocalCreateListener, _XSERVTransLocalResetListener, _XSERVTransLocalAccept, - _XSERVTransLocalBytesReadable, _XSERVTransLocalRead, _XSERVTransLocalWrite, #if XTRANS_SEND_FDS @@ -854,7 +845,6 @@ static Xtransport _XSERVTransNAMEDFuncs = { _XSERVTransLocalCreateListener, _XSERVTransLocalResetListener, _XSERVTransLocalAccept, - _XSERVTransLocalBytesReadable, _XSERVTransLocalRead, _XSERVTransLocalWrite, #if XTRANS_SEND_FDS @@ -877,7 +867,6 @@ static Xtransport _XSERVTransPIPEFuncs = { _XSERVTransLocalCreateListener, _XSERVTransLocalResetListener, _XSERVTransLocalAccept, - _XSERVTransLocalBytesReadable, _XSERVTransLocalRead, _XSERVTransLocalWrite, #if XTRANS_SEND_FDS diff --git a/os/Xtranssock.c b/os/Xtranssock.c index eb341adcf..777feb21a 100644 --- a/os/Xtranssock.c +++ b/os/Xtranssock.c @@ -1171,14 +1171,6 @@ static XtransConnInfo _XSERVTransSocketUNIXAccept ( #endif /* UNIXCONN */ -static int _XSERVTransSocketBytesReadable ( - XtransConnInfo ciptr, BytesReadable_t *pend) -{ - prmsg (2,"SocketBytesReadable(%p,%d,%p)\n", - (void *) ciptr, ciptr->fd, (void *) pend); - return ossock_ioctl (ciptr->fd, FIONREAD, pend); -} - #if XTRANS_SEND_FDS static void @@ -1483,7 +1475,6 @@ static Xtransport _XSERVTransSocketTCPFuncs = { _XSERVTransSocketINETCreateListener, NULL, /* ResetListener */ _XSERVTransSocketINETAccept, - _XSERVTransSocketBytesReadable, _XSERVTransSocketRead, _XSERVTransSocketWrite, #if XTRANS_SEND_FDS @@ -1506,7 +1497,6 @@ static Xtransport _XSERVTransSocketINETFuncs = { _XSERVTransSocketINETCreateListener, NULL, /* ResetListener */ _XSERVTransSocketINETAccept, - _XSERVTransSocketBytesReadable, _XSERVTransSocketRead, _XSERVTransSocketWrite, #if XTRANS_SEND_FDS @@ -1530,7 +1520,6 @@ static Xtransport _XSERVTransSocketINET6Funcs = { _XSERVTransSocketINETCreateListener, NULL, /* ResetListener */ _XSERVTransSocketINETAccept, - _XSERVTransSocketBytesReadable, _XSERVTransSocketRead, _XSERVTransSocketWrite, #if XTRANS_SEND_FDS @@ -1561,7 +1550,6 @@ static Xtransport _XSERVTransSocketLocalFuncs = { _XSERVTransSocketUNIXCreateListener, _XSERVTransSocketUNIXResetListener, _XSERVTransSocketUNIXAccept, - _XSERVTransSocketBytesReadable, _XSERVTransSocketRead, _XSERVTransSocketWrite, #if XTRANS_SEND_FDS @@ -1596,7 +1584,6 @@ static Xtransport _XSERVTransSocketUNIXFuncs = { _XSERVTransSocketUNIXCreateListener, _XSERVTransSocketUNIXResetListener, _XSERVTransSocketUNIXAccept, - _XSERVTransSocketBytesReadable, _XSERVTransSocketRead, _XSERVTransSocketWrite, #if XTRANS_SEND_FDS