XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-27 18:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

os: use ssize_t in xtrans write{,v}

Browse Source 
Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111
2025-08-08 01:04:09 +03:00
committed by Enrico Weigelt
parent 8d2860fd35
commit 81770d7315
5 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
os/Xtrans.c
View File

@@ -705,12 +705,12 @@ int _XSERVTransRead (XtransConnInfo ciptr, char *buf, int size)
return ciptr->transptr->Read (ciptr, buf, size);
}
int _XSERVTransWrite (XtransConnInfo ciptr, const char *buf, int size)
ssize_t _XSERVTransWrite (XtransConnInfo ciptr, const char *buf, size_t size)
{
return ciptr->transptr->Write (ciptr, buf, size);
}
int _XSERVTransWritev (XtransConnInfo ciptr, struct iovec *buf, int size)
ssize_t _XSERVTransWritev (XtransConnInfo ciptr, struct iovec *buf, int size)
{
return ciptr->transptr->Writev (ciptr, buf, size);
}

6
os/Xtrans.h
View File

@@ -232,13 +232,13 @@ int _XSERVTransRead (
int /* size */
);
int _XSERVTransWrite (
ssize_t _XSERVTransWrite (
XtransConnInfo, /* ciptr */
const char *, /* buf */
int /* size */
size_t /* size */
);
int _XSERVTransWritev (
ssize_t _XSERVTransWritev (
XtransConnInfo, /* ciptr */
struct iovec *, /* buf */
int /* size */

6
os/Xtransint.h
View File

@@ -181,13 +181,13 @@ typedef struct _Xtransport {
int /* size */
);
int (*Write)(
ssize_t (*Write)(
XtransConnInfo, /* connection */
const char *, /* buf */
int /* size */
size_t /* size */
);
int (*Writev)(
ssize_t (*Writev)(
XtransConnInfo, /* connection */
struct iovec *, /* buf */
int /* size */

4
os/Xtranslcl.c
View File

@@ -754,14 +754,14 @@ static int _XSERVTransLocalRead(XtransConnInfo ciptr, char *buf, int size)
return read(ciptr->fd,buf,size);
}
static int _XSERVTransLocalWrite(XtransConnInfo ciptr, const char *buf, int 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 int _XSERVTransLocalWritev(XtransConnInfo ciptr, struct iovec *buf, int size)
static ssize_t _XSERVTransLocalWritev(XtransConnInfo ciptr, struct iovec *buf, int size)
{
prmsg(2,"LocalWritev(%d,%p,%d)\n", ciptr->fd, (const void *) buf, size );

16
os/Xtranssock.c
View File

@@ -1337,7 +1337,7 @@ static int _XSERVTransSocketRead (
#endif /* WIN32 */
}
static int _XSERVTransSocketWritev (
static ssize_t _XSERVTransSocketWritev (
XtransConnInfo ciptr, struct iovec *buf, int size)
{
prmsg (2,"SocketWritev(%d,%p,%d)\n", ciptr->fd, (void *) buf, size);
@@ -1357,7 +1357,7 @@ static int _XSERVTransSocketWritev (
.msg_controllen = CMSG_LEN(nfd * sizeof(int))
};
struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg);
int i;
ssize_t i;
int *fds;
hdr->cmsg_len = msg.msg_controllen;
@@ -1380,17 +1380,15 @@ static int _XSERVTransSocketWritev (
return WRITEV (ciptr, buf, size);
}
static int _XSERVTransSocketWrite (
XtransConnInfo ciptr, const char *buf, int size)
static ssize_t _XSERVTransSocketWrite (
XtransConnInfo ciptr, const char *buf, size_t size)
{
prmsg (2,"SocketWrite(%d,%p,%d)\n", ciptr->fd, (const void *) buf, size);
prmsg (2,"SocketWrite(%d,%p,%lu)\n", ciptr->fd, (const void *) buf, (unsigned long)size);
#if defined(WIN32)
{
int ret = send ((SOCKET)ciptr->fd, buf, size, 0);
#ifdef WIN32
{
ssize_t ret = send ((SOCKET)ciptr->fd, buf, size, 0);
if (ret == SOCKET_ERROR) errno = WSAGetLastError();
#endif
return ret;
}
#else