Rename do_sendv_recvv() to qemu_sendv_recvv(),
change its last arg (do_sendv) from int to bool,
export it in qemu-common.h, and made the two
callers of it (qemu_sendv() and qemu_recvv())
to be trivial #defines just adding 5th arg.
qemu_sendv_recvv() will be used later.
Signed-off-by: Michael Tokarev <m...@tls.msk.ru>
---
cutils.c | 19 ++++---------------
qemu-common.h | 14 ++++++++++++--
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/cutils.c b/cutils.c
index e9052fc..be2173f 100644
--- a/cutils.c
+++ b/cutils.c
@@ -383,7 +383,7 @@ int qemu_parse_fd(const char *param)
* The first `offset' bytes in the iovec buffer are skipped and next
* `bytes' bytes are used, which must be within data of iovec.
*
- * r = do_sendv_recvv(sockfd, iov, offset, bytes, 1);
+ * r = qemu_sendv_recvv(sockfd, iov, offset, butes, true);
*
* is logically equivalent to
*
@@ -392,9 +392,9 @@ int qemu_parse_fd(const char *param)
* r = send(sockfd, buf, size, 0);
* free(buf);
*/
-static ssize_t do_sendv_recvv(int sockfd, struct iovec *iov,
- size_t offset, size_t bytes,
- int do_sendv)
+ssize_t qemu_sendv_recvv(int sockfd, struct iovec *iov,
+ size_t offset, size_t bytes,
+ bool do_sendv)
{
int iovlen;
ssize_t ret;
@@ -474,14 +474,3 @@ static ssize_t do_sendv_recvv(int sockfd, struct iovec
*iov,
last_iov->iov_len += diff;
return ret;
}
-
-ssize_t qemu_recvv(int sockfd, struct iovec *iov, size_t offset, size_t bytes)
-{
- return do_sendv_recvv(sockfd, iov, offset, bytes, 0);
-}
-
-ssize_t qemu_sendv(int sockfd, struct iovec *iov, size_t offset, size_t bytes)
-{
- return do_sendv_recvv(sockfd, iov, offset, bytes, 1);
-}
-
diff --git a/qemu-common.h b/qemu-common.h
index 8d12fca..b01d84c 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -199,8 +199,18 @@ int qemu_pipe(int pipefd[2]);
#define qemu_recv(sockfd, buf, len, flags) recv(sockfd, buf, len, flags)
#endif
-ssize_t qemu_recvv(int sockfd, struct iovec *iov, size_t offset, size_t bytes);
-ssize_t qemu_sendv(int sockfd, struct iovec *iov, size_t offset, size_t bytes);
+/**
+ * Send or receive data from/to an (optionally partial) iovec.
+ * Instead of processing whole iovector, this routine can process
+ * not more than a specified number of bytes, and start not at
+ * the beginning of iovec but at byte position `offset'.
+ */
+ssize_t qemu_sendv_recvv(int sockfd, struct iovec *iov,
+ size_t offset, size_t bytes, bool do_sendv);
+#define qemu_recvv(sockfd, iov, offset, bytes) \
+ qemu_sendv_recvv(sockfd, iov, offset, bytes, false)
+#define qemu_sendv(sockfd, iov, offset, bytes) \
+ qemu_sendv_recvv(sockfd, iov, offset, bytes, true)
/* Error handling. */
--
1.7.9.1
