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

os: use size_t as iov length parameter xtrans writev{,v}

Browse Source 
struct msghdr is using size_t as for iov_length, so match up with it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-08 12:14:42 +02:00
committed by Enrico Weigelt
parent 81770d7315
commit 26c2df04e9
5 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
os/Xtrans.c
View File

@@ -710,9 +710,9 @@ ssize_t _XSERVTransWrite (XtransConnInfo ciptr, const char *buf, size_t size)
return ciptr->transptr->Write (ciptr, buf, size);
}
ssize_t _XSERVTransWritev (XtransConnInfo ciptr, struct iovec *buf, int size)
ssize_t _XSERVTransWritev (XtransConnInfo ciptr, struct iovec *buf, size_t iovcnt)
{
return ciptr->transptr->Writev (ciptr, buf, size);
return ciptr->transptr->Writev (ciptr, buf, iovcnt);
}
#if XTRANS_SEND_FDS
@@ -1039,7 +1039,7 @@ int _XSERVTransMakeAllCOTSServerListeners (const char *port, int *partial,
/*
* emulate writev
*/
static int _XSERVTransWriteV (XtransConnInfo ciptr, struct iovec *iov, int iovcnt)
static int _XSERVTransWriteV (XtransConnInfo ciptr, struct iovec *iov, size_t iovcnt)
{
int i, len, total;
char *base;

6
os/Xtrans.h
View File

@@ -238,11 +238,7 @@ ssize_t _XSERVTransWrite (
size_t /* size */
);
ssize_t _XSERVTransWritev (
XtransConnInfo, /* ciptr */
struct iovec *, /* buf */
int /* size */
);
ssize_t _XSERVTransWritev (XtransConnInfo ciptr, struct iovec *iov, size_t iovcnt);
int _XSERVTransSendFd (XtransConnInfo ciptr, int fd, int do_close);

12
os/Xtransint.h
View File

@@ -187,11 +187,7 @@ typedef struct _Xtransport {
size_t /* size */
);
ssize_t (*Writev)(
XtransConnInfo, /* connection */
struct iovec *, /* buf */
int /* size */
);
ssize_t (*Writev)(XtransConnInfo ciptr, struct iovec *iov, size_t iovcnt);
#if XTRANS_SEND_FDS
int (*SendFd)(
@@ -257,11 +253,7 @@ typedef struct _Xtransport_table {
#define WRITEV(ciptr, iov, iovcnt) _XSERVTransWriteV(ciptr, iov, iovcnt)
static int _XSERVTransWriteV(
XtransConnInfo, /* ciptr */
struct iovec *, /* iov */
int /* iovcnt */
);
static int _XSERVTransWriteV(XtransConnInfo ciptr, struct iovec *iov, size_t iovcnt);
#else

6
os/Xtranslcl.c
View File

@@ -761,11 +761,11 @@ static ssize_t _XSERVTransLocalWrite(XtransConnInfo ciptr, const char *buf, size
return write(ciptr->fd,buf,size);
}
static ssize_t _XSERVTransLocalWritev(XtransConnInfo ciptr, struct iovec *buf, int size)
static ssize_t _XSERVTransLocalWritev(XtransConnInfo ciptr, struct iovec *iov, size_t iovcnt)
{
prmsg(2,"LocalWritev(%d,%p,%d)\n", ciptr->fd, (const void *) buf, size );
prmsg(2,"LocalWritev(%d,%p,%d)\n", ciptr->fd, (const void *) iov, iovcnt);
return WRITEV(ciptr,buf,size);
return WRITEV(ciptr,iov,iovcnt);
}
static int _XSERVTransLocalDisconnect(XtransConnInfo ciptr)

10
os/Xtranssock.c
View File

@@ -1338,9 +1338,9 @@ static int _XSERVTransSocketRead (
}
static ssize_t _XSERVTransSocketWritev (
XtransConnInfo ciptr, struct iovec *buf, int size)
XtransConnInfo ciptr, struct iovec *iov, size_t iovcnt)
{
prmsg (2,"SocketWritev(%d,%p,%d)\n", ciptr->fd, (void *) buf, size);
prmsg (2,"SocketWritev(%d,%p,%d)\n", ciptr->fd, (void *) iov, iovcnt);
#if XTRANS_SEND_FDS
if (ciptr->send_fds)
@@ -1351,8 +1351,8 @@ static ssize_t _XSERVTransSocketWritev (
struct msghdr msg = {
.msg_name = NULL,
.msg_namelen = 0,
.msg_iov = buf,
.msg_iovlen = size,
.msg_iov = iov,
.msg_iovlen = iovcnt,
.msg_control = cmsgbuf.buf,
.msg_controllen = CMSG_LEN(nfd * sizeof(int))
};
@@ -1377,7 +1377,7 @@ static ssize_t _XSERVTransSocketWritev (
return i;
}
#endif
return WRITEV (ciptr, buf, size);
return WRITEV (ciptr, iov, iovcnt);
}
static ssize_t _XSERVTransSocketWrite (