Consistent ordering of arguments in iov_* functions

Signed-off-by: Martin Sustrik <[email protected]>

Author: sustrik

bthrottler.c

@@ -120,7 +120,7 @@ static int bthrottler_bsendv(struct bsock_vfs *bvfs,
             size_t tosend = bytes < obj->send_remaining ?
                 bytes : obj->send_remaining;
             struct iovec vec[iovlen];
-            size_t veclen = iov_cut(iov, vec, iovlen, pos, tosend);
+            size_t veclen = iov_cut(vec, iov, iovlen, pos, tosend);
             int rc = bsendv(obj->s, vec, veclen, deadline);
             if(dsock_slow(rc < 0)) return -1;
             obj->send_remaining -= tosend;
@@ -153,7 +153,7 @@ static int bthrottler_brecvv(struct bsock_vfs *bvfs,
             size_t torecv = bytes < obj->recv_remaining ?
                 bytes : obj->recv_remaining;
             struct iovec vec[iovlen];
-            size_t veclen = iov_cut(iov, vec, iovlen, pos, torecv);
+            size_t veclen = iov_cut(vec, iov, iovlen, pos, torecv);
             int rc = brecvv(obj->s, vec, veclen, deadline);
             if(dsock_slow(rc < 0)) return -1;
             obj->recv_remaining -= torecv;

fd.c

@@ -102,7 +102,7 @@ int fd_send(int s, const struct iovec *iov, size_t iovlen, int64_t deadline) {
     ssize_t sent = 0;
     while(sent < len) {
         struct iovec vec[iovlen];
-        size_t veclen = iov_cut(iov, vec, iovlen, sent, len - sent);
+        size_t veclen = iov_cut(vec, iov, iovlen, sent, len - sent);
         hdr.msg_iov = vec;
         hdr.msg_iovlen = veclen;
         ssize_t sz = sendmsg(s, &hdr, FD_NOSIGNAL);
@@ -125,7 +125,7 @@ static ssize_t fdget(int s, struct iovec *iov, size_t iovlen, int block,
     size_t len = iov_size(iov, iovlen);
     while(1) {
         struct iovec vec[iovlen];
-        size_t veclen = iov_cut(iov, vec, iovlen, pos, len);
+        size_t veclen = iov_cut(vec, iov, iovlen, pos, len);
         hdr.msg_iov = vec;
         hdr.msg_iovlen = veclen;
         ssize_t sz = recvmsg(s, &hdr, 0);
@@ -162,7 +162,7 @@ int fd_recv(int s, struct fd_rxbuf *rxbuf, const struct iovec *iov,
         /* If requested amount of data is large avoid the copy
            and read it directly into user's buffer. */
         if(len >= sizeof(rxbuf->data)) {
-            size_t veclen = iov_cut(iov, vec, iovlen, pos, len);
+            size_t veclen = iov_cut(vec, iov, iovlen, pos, len);
             ssize_t sz = fdget(s, vec, veclen, 1, deadline);
             if(dsock_slow(sz < 0)) return -1;
             return 0;

iov.c

@@ -56,7 +56,7 @@ void iov_copy(struct iovec *dst, const struct iovec *src, size_t len) {
     for(i = 0; i != len; ++i) dst[i] = src[i];
 }
 
-size_t iov_cut(const struct iovec *src, struct iovec *dst, size_t iovlen,
+size_t iov_cut(struct iovec *dst, const struct iovec *src, size_t iovlen,
       size_t offset, size_t bytes) {
     /* Get rid of corner cases. */
     if(dsock_slow(bytes == 0)) return 0;
@@ -86,14 +86,14 @@ size_t iov_cut(const struct iovec *src, struct iovec *dst, size_t iovlen,
 void iov_copyfrom(void *dst, const struct iovec *src, size_t srclen,
       size_t offset, size_t bytes) {
     struct iovec vec[srclen];
-    size_t veclen = iov_cut(src, vec, srclen, offset, bytes);
+    size_t veclen = iov_cut(vec, src, srclen, offset, bytes);
     iov_copyallfrom(dst, vec, veclen);
 }
 
 void iov_copyto(const struct iovec *dst, size_t dstlen, const void *src,
       size_t offset, size_t bytes) {
     struct iovec vec[dstlen];
-    size_t veclen = iov_cut(dst, vec, dstlen, offset, bytes);
+    size_t veclen = iov_cut(vec, dst, dstlen, offset, bytes);
     iov_copyallto(vec, veclen, src);
 }
 

iov.h

@@ -41,7 +41,7 @@ void iov_copyallto(const struct iovec *dst, size_t dstlen, const void *src);
 
 void iov_copy(struct iovec *dst, const struct iovec *src, size_t len);
 
-size_t iov_cut(const struct iovec *src, struct iovec *dst, size_t iovlen,
+size_t iov_cut(struct iovec *dst, const struct iovec *src, size_t iovlen,
       size_t offset, size_t bytes);
 
 #endif

pfx.c

@@ -134,7 +134,7 @@ static ssize_t pfx_mrecvv(struct msock_vfs *mvfs,
         return -1;
     }
     struct iovec vec[iovlen];
-    size_t veclen = iov_cut(iov, vec, iovlen, 0, sz);
+    size_t veclen = iov_cut(vec, iov, iovlen, 0, sz);
     rc = brecvv(obj->s, vec, veclen, deadline);
     if(dsock_slow(rc < 0)) return -1;
     return sz;