Rename do_sendv_recvv() to qemu_sendv_recvv(), change its last arg (do_send) 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 | 15 ++------------- qemu-common.h | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/cutils.c b/cutils.c index 89305ad..6d9175f 100644 --- a/cutils.c +++ b/cutils.c @@ -426,8 +426,8 @@ int qemu_parse_fd(const char *param) * The first `offset' bytes in the iovec buffer are skipped and next * `bytes' bytes are used. */ -static int do_sendv_recvv(int sockfd, struct iovec *iov, size_t bytes, size_t offset, - int do_sendv) +int qemu_sendv_recvv(int sockfd, struct iovec *iov, size_t bytes, size_t offset, + bool do_sendv) { int ret, iovlen; size_t diff; @@ -506,14 +506,3 @@ static int do_sendv_recvv(int sockfd, struct iovec *iov, size_t bytes, size_t of last_iov->iov_len += diff; return ret; } - -int qemu_recvv(int sockfd, struct iovec *iov, size_t bytes, size_t offset) -{ - return do_sendv_recvv(sockfd, iov, bytes, offset, 0); -} - -int qemu_sendv(int sockfd, struct iovec *iov, size_t bytes, size_t offset) -{ - return do_sendv_recvv(sockfd, iov, bytes, offset, 1); -} - diff --git a/qemu-common.h b/qemu-common.h index c0536b3..474cbcc 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 -int qemu_recvv(int sockfd, struct iovec *iov, size_t bytes, size_t offset); -int qemu_sendv(int sockfd, struct iovec *iov, size_t bytes, size_t offset); +/** + * 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'. + */ +int qemu_sendv_recvv(int sockfd, struct iovec *iov, + size_t bytes, size_t offset, bool do_sendv); +#define qemu_recvv(sockfd, iov, bytes, offset) \ + qemu_sendv_recvv(sockfd, iov, bytes, offset, false) +#define qemu_sendv(sockfd, iov, bytes, offset) \ + qemu_sendv_recvv(sockfd, iov, bytes, offset, true) /* Error handling. */ -- 1.7.9.1