diff --git a/os/Xtrans.c b/os/Xtrans.c
index 857d80ed30..0eb70852cb 100644
--- a/os/Xtrans.c
+++ b/os/Xtrans.c
@@ -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;
diff --git a/os/Xtrans.h b/os/Xtrans.h
index 8ca0be1334..813aa540a0 100644
--- a/os/Xtrans.h
+++ b/os/Xtrans.h
@@ -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);
 
diff --git a/os/Xtransint.h b/os/Xtransint.h
index 27aa7f46d3..86c230c2ea 100644
--- a/os/Xtransint.h
+++ b/os/Xtransint.h
@@ -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
 
diff --git a/os/Xtranslcl.c b/os/Xtranslcl.c
index 5beb78773b..8ad854958f 100644
--- a/os/Xtranslcl.c
+++ b/os/Xtranslcl.c
@@ -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)
diff --git a/os/Xtranssock.c b/os/Xtranssock.c
index 06f0c6d2b8..8455103c5e 100644
--- a/os/Xtranssock.c
+++ b/os/Xtranssock.c
@@ -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 (