diff --git a/os/Xtrans.c b/os/Xtrans.c index 347a9e9df..86db51327 100644 --- a/os/Xtrans.c +++ b/os/Xtrans.c @@ -707,7 +707,7 @@ int _XSERVTransRead (XtransConnInfo ciptr, char *buf, int size) ssize_t _XSERVTransWrite (XtransConnInfo ciptr, const char *buf, size_t size) { - return ciptr->transptr->Writev (ciptr, buf, size); + return ciptr->transptr->Write (ciptr, buf, size); } #if XTRANS_SEND_FDS diff --git a/os/Xtransint.h b/os/Xtransint.h index e899df672..03a47c37f 100644 --- a/os/Xtransint.h +++ b/os/Xtransint.h @@ -181,7 +181,7 @@ typedef struct _Xtransport { int /* size */ ); - ssize_t (*Writev)(XtransConnInfo ciptr, const char *buf, size_t size); + ssize_t (*Write)(XtransConnInfo ciptr, const char *buf, size_t size); #if XTRANS_SEND_FDS int (*SendFd)( diff --git a/os/Xtranslcl.c b/os/Xtranslcl.c index 17a663fbc..89c6aaab3 100644 --- a/os/Xtranslcl.c +++ b/os/Xtranslcl.c @@ -754,9 +754,9 @@ static int _XSERVTransLocalRead(XtransConnInfo ciptr, char *buf, int size) return read(ciptr->fd,buf,size); } -static ssize_t _XSERVTransLocalWritev(XtransConnInfo ciptr, const char *buf, size_t size) +static ssize_t _XSERVTransLocalWrite(XtransConnInfo ciptr, const char *buf, size_t size) { - prmsg(2,"LocalWritev(%d,%p,%d)\n", ciptr->fd, (const void *) iov, iovcnt); + prmsg(2,"LocalWrite(%d,%p,%d)\n", ciptr->fd, (const void *) buf, size ); return write(ciptr->fd,buf,size); } @@ -830,7 +830,7 @@ static Xtransport _XSERVTransLocalFuncs = { _XSERVTransLocalAccept, _XSERVTransLocalBytesReadable, _XSERVTransLocalRead, - _XSERVTransLocalWritev, + _XSERVTransLocalWrite, #if XTRANS_SEND_FDS _XSERVTransLocalSendFdInvalid, _XSERVTransLocalRecvFdInvalid, @@ -856,7 +856,7 @@ static Xtransport _XSERVTransNAMEDFuncs = { _XSERVTransLocalAccept, _XSERVTransLocalBytesReadable, _XSERVTransLocalRead, - _XSERVTransLocalWritev, + _XSERVTransLocalWrite, #if XTRANS_SEND_FDS _XSERVTransLocalSendFdInvalid, _XSERVTransLocalRecvFdInvalid, @@ -879,7 +879,7 @@ static Xtransport _XSERVTransPIPEFuncs = { _XSERVTransLocalAccept, _XSERVTransLocalBytesReadable, _XSERVTransLocalRead, - _XSERVTransLocalWritev, + _XSERVTransLocalWrite, #if XTRANS_SEND_FDS _XSERVTransLocalSendFdInvalid, _XSERVTransLocalRecvFdInvalid, diff --git a/os/Xtranssock.c b/os/Xtranssock.c index cb737af9a..8b2a88626 100644 --- a/os/Xtranssock.c +++ b/os/Xtranssock.c @@ -1337,10 +1337,10 @@ static int _XSERVTransSocketRead ( #endif /* WIN32 */ } -static ssize_t _XSERVTransSocketWritev ( +static ssize_t _XSERVTransSocketWrite ( XtransConnInfo ciptr, const char *buf, size_t size) { - prmsg (2,"SocketWritev(%d,%p,%ld)\n", ciptr->fd, (void *) buf, (unsigned long)size); + prmsg (2,"SocketWrite(%d,%p,%ld)\n", ciptr->fd, (void *) buf, (unsigned long)size); #if XTRANS_SEND_FDS if (ciptr->send_fds) @@ -1485,7 +1485,7 @@ static Xtransport _XSERVTransSocketTCPFuncs = { _XSERVTransSocketINETAccept, _XSERVTransSocketBytesReadable, _XSERVTransSocketRead, - _XSERVTransSocketWritev, + _XSERVTransSocketWrite, #if XTRANS_SEND_FDS _XSERVTransSocketSendFdInvalid, _XSERVTransSocketRecvFdInvalid, @@ -1508,7 +1508,7 @@ static Xtransport _XSERVTransSocketINETFuncs = { _XSERVTransSocketINETAccept, _XSERVTransSocketBytesReadable, _XSERVTransSocketRead, - _XSERVTransSocketWritev, + _XSERVTransSocketWrite, #if XTRANS_SEND_FDS _XSERVTransSocketSendFdInvalid, _XSERVTransSocketRecvFdInvalid, @@ -1532,7 +1532,7 @@ static Xtransport _XSERVTransSocketINET6Funcs = { _XSERVTransSocketINETAccept, _XSERVTransSocketBytesReadable, _XSERVTransSocketRead, - _XSERVTransSocketWritev, + _XSERVTransSocketWrite, #if XTRANS_SEND_FDS _XSERVTransSocketSendFdInvalid, _XSERVTransSocketRecvFdInvalid, @@ -1563,7 +1563,7 @@ static Xtransport _XSERVTransSocketLocalFuncs = { _XSERVTransSocketUNIXAccept, _XSERVTransSocketBytesReadable, _XSERVTransSocketRead, - _XSERVTransSocketWritev, + _XSERVTransSocketWrite, #if XTRANS_SEND_FDS _XSERVTransSocketSendFd, _XSERVTransSocketRecvFd, @@ -1598,7 +1598,7 @@ static Xtransport _XSERVTransSocketUNIXFuncs = { _XSERVTransSocketUNIXAccept, _XSERVTransSocketBytesReadable, _XSERVTransSocketRead, - _XSERVTransSocketWritev, + _XSERVTransSocketWrite, #if XTRANS_SEND_FDS _XSERVTransSocketSendFd, _XSERVTransSocketRecvFd,