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

os: xtrans: drop old Write() methods

Browse Source 
Since everything's running via Writev() methods now, the now unused Write()
methods can all be dropped.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-31 13:02:23 +02:00
committed by Enrico Weigelt
parent a52ac4fb26
commit 3c5caa1ba0
3 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
os/Xtransint.h
View File

@@ -181,12 +181,6 @@ typedef struct _Xtransport {
int /* size */
);
ssize_t (*Write)(
XtransConnInfo, /* connection */
const char *, /* buf */
size_t /* size */
);
ssize_t (*Writev)(XtransConnInfo ciptr, const char *buf, size_t size);
#if XTRANS_SEND_FDS

10
os/Xtranslcl.c
View File

@@ -754,13 +754,6 @@ static int _XSERVTransLocalRead(XtransConnInfo ciptr, char *buf, int size)
return read(ciptr->fd,buf,size);
}
static ssize_t _XSERVTransLocalWrite(XtransConnInfo ciptr, const char *buf, size_t size)
{
prmsg(2,"LocalWrite(%d,%p,%d)\n", ciptr->fd, (const void *) buf, size );
return write(ciptr->fd,buf,size);
}
static ssize_t _XSERVTransLocalWritev(XtransConnInfo ciptr, const char *buf, size_t size)
{
prmsg(2,"LocalWritev(%d,%p,%d)\n", ciptr->fd, (const void *) iov, iovcnt);
@@ -837,7 +830,6 @@ static Xtransport _XSERVTransLocalFuncs = {
_XSERVTransLocalAccept,
_XSERVTransLocalBytesReadable,
_XSERVTransLocalRead,
_XSERVTransLocalWrite,
_XSERVTransLocalWritev,
#if XTRANS_SEND_FDS
_XSERVTransLocalSendFdInvalid,
@@ -864,7 +856,6 @@ static Xtransport _XSERVTransNAMEDFuncs = {
_XSERVTransLocalAccept,
_XSERVTransLocalBytesReadable,
_XSERVTransLocalRead,
_XSERVTransLocalWrite,
_XSERVTransLocalWritev,
#if XTRANS_SEND_FDS
_XSERVTransLocalSendFdInvalid,
@@ -888,7 +879,6 @@ static Xtransport _XSERVTransPIPEFuncs = {
_XSERVTransLocalAccept,
_XSERVTransLocalBytesReadable,
_XSERVTransLocalRead,
_XSERVTransLocalWrite,
_XSERVTransLocalWritev,
#if XTRANS_SEND_FDS
_XSERVTransLocalSendFdInvalid,

27
os/Xtranssock.c
View File

@@ -1391,28 +1391,6 @@ static ssize_t _XSERVTransSocketWritev (
#endif
}
static ssize_t _XSERVTransSocketWrite (
XtransConnInfo ciptr, const char *buf, size_t size)
{
prmsg (2,"SocketWrite(%d,%p,%lu)\n", ciptr->fd, (const void *) buf, (unsigned long)size);
#ifdef WIN32
{
ssize_t ret = send ((SOCKET)ciptr->fd, buf, size, 0);
if (ret == SOCKET_ERROR) errno = WSAGetLastError();
return ret;
}
#else
#if XTRANS_SEND_FDS
if (ciptr->send_fds)
{
return _XSERVTransSocketWritev(ciptr, buf, size);
}
#endif /* XTRANS_SEND_FDS */
return write (ciptr->fd, buf, size);
#endif /* WIN32 */
}
static int _XSERVTransSocketDisconnect (XtransConnInfo ciptr)
{
prmsg (2,"SocketDisconnect(%p,%d)\n", (void *) ciptr, ciptr->fd);
@@ -1507,7 +1485,6 @@ static Xtransport _XSERVTransSocketTCPFuncs = {
_XSERVTransSocketINETAccept,
_XSERVTransSocketBytesReadable,
_XSERVTransSocketRead,
_XSERVTransSocketWrite,
_XSERVTransSocketWritev,
#if XTRANS_SEND_FDS
_XSERVTransSocketSendFdInvalid,
@@ -1531,7 +1508,6 @@ static Xtransport _XSERVTransSocketINETFuncs = {
_XSERVTransSocketINETAccept,
_XSERVTransSocketBytesReadable,
_XSERVTransSocketRead,
_XSERVTransSocketWrite,
_XSERVTransSocketWritev,
#if XTRANS_SEND_FDS
_XSERVTransSocketSendFdInvalid,
@@ -1556,7 +1532,6 @@ static Xtransport _XSERVTransSocketINET6Funcs = {
_XSERVTransSocketINETAccept,
_XSERVTransSocketBytesReadable,
_XSERVTransSocketRead,
_XSERVTransSocketWrite,
_XSERVTransSocketWritev,
#if XTRANS_SEND_FDS
_XSERVTransSocketSendFdInvalid,
@@ -1588,7 +1563,6 @@ static Xtransport _XSERVTransSocketLocalFuncs = {
_XSERVTransSocketUNIXAccept,
_XSERVTransSocketBytesReadable,
_XSERVTransSocketRead,
_XSERVTransSocketWrite,
_XSERVTransSocketWritev,
#if XTRANS_SEND_FDS
_XSERVTransSocketSendFd,
@@ -1624,7 +1598,6 @@ static Xtransport _XSERVTransSocketUNIXFuncs = {
_XSERVTransSocketUNIXAccept,
_XSERVTransSocketBytesReadable,
_XSERVTransSocketRead,
_XSERVTransSocketWrite,
_XSERVTransSocketWritev,
#if XTRANS_SEND_FDS
_XSERVTransSocketSendFd,