From patchwork Sat Mar 10 16:32:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 145865 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 400CCB6FA5 for ; Sun, 11 Mar 2012 03:33:41 +1100 (EST) Received: from localhost ([::1]:57080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6PEh-0000fs-0e for incoming@patchwork.ozlabs.org; Sat, 10 Mar 2012 11:33:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6PE9-00087o-9O for qemu-devel@nongnu.org; Sat, 10 Mar 2012 11:33:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6PE7-0006Mw-7W for qemu-devel@nongnu.org; Sat, 10 Mar 2012 11:33:04 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:60781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6PE6-0006Mb-Sm for qemu-devel@nongnu.org; Sat, 10 Mar 2012 11:33:03 -0500 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 6758EA074F; Sat, 10 Mar 2012 20:33:01 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 625AB167; Sat, 10 Mar 2012 20:33:00 +0400 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sat, 10 Mar 2012 20:32:27 +0400 Message-Id: <1331397150-25700-3-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1331397150-25700-1-git-send-email-mjt@tls.msk.ru> References: <1331397150-25700-1-git-send-email-mjt@tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 86.62.121.231 Cc: Michael Tokarev Subject: [Qemu-devel] [PATCH 2/5] change prototypes of qemu_sendv() and qemu_recvv() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Rename arguments and use size_t for sizes instead of int -qemu_sendv(int sockfd, struct iovec *iov, int len, int iov_offset) +qemu_sendv(int sockfd, struct iovec *iov, size_t bytes, size_t offset) The main motivation was to make it clear that length and offset are in _bytes_, not in iov elements: it was very confusing before, because all standard functions which deals with iovecs expects number of iovs, not bytes, even the fact that struct iovec has iov_len and iov_ prefix does not help. With "bytes" and "offset", especially since they're now size_t, it is much more explicit. All callers of qemu_sendv() and qemu_recvv() and related, like qemu_co_sendv() and qemu_co_recvv(), were checked to verify that it is safe to use unsigned datatype instead of int. While at it, clean up misleading comment near do_sendv_recvv(). Signed-off-by: Michael Tokarev --- cutils.c | 34 ++++++++++++---------------------- qemu-common.h | 4 ++-- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/cutils.c b/cutils.c index 27687c8..89305ad 100644 --- a/cutils.c +++ b/cutils.c @@ -424,38 +424,28 @@ int qemu_parse_fd(const char *param) * * This function send/recv data from/to the iovec buffer directly. * The first `offset' bytes in the iovec buffer are skipped and next - * `len' bytes are used. - * - * For example, - * - * do_sendv_recvv(sockfd, iov, len, offset, 1); - * - * is equal to - * - * char *buf = malloc(size); - * iov_to_buf(iov, iovcnt, buf, offset, size); - * send(sockfd, buf, size, 0); - * free(buf); + * `bytes' bytes are used. */ -static int do_sendv_recvv(int sockfd, struct iovec *iov, int len, int offset, +static int do_sendv_recvv(int sockfd, struct iovec *iov, size_t bytes, size_t offset, int do_sendv) { - int ret, diff, iovlen; + int ret, iovlen; + size_t diff; struct iovec *last_iov; /* last_iov is inclusive, so count from one. */ iovlen = 1; last_iov = iov; - len += offset; + bytes += offset; - while (last_iov->iov_len < len) { - len -= last_iov->iov_len; + while (last_iov->iov_len < bytes) { + bytes -= last_iov->iov_len; last_iov++; iovlen++; } - diff = last_iov->iov_len - len; + diff = last_iov->iov_len - bytes; last_iov->iov_len -= diff; while (iov->iov_len <= offset) { @@ -517,13 +507,13 @@ static int do_sendv_recvv(int sockfd, struct iovec *iov, int len, int offset, return ret; } -int qemu_recvv(int sockfd, struct iovec *iov, int len, int iov_offset) +int qemu_recvv(int sockfd, struct iovec *iov, size_t bytes, size_t offset) { - return do_sendv_recvv(sockfd, iov, len, iov_offset, 0); + return do_sendv_recvv(sockfd, iov, bytes, offset, 0); } -int qemu_sendv(int sockfd, struct iovec *iov, int len, int iov_offset) +int qemu_sendv(int sockfd, struct iovec *iov, size_t bytes, size_t offset) { - return do_sendv_recvv(sockfd, iov, len, iov_offset, 1); + return do_sendv_recvv(sockfd, iov, bytes, offset, 1); } diff --git a/qemu-common.h b/qemu-common.h index b7e426e..c0536b3 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -199,8 +199,8 @@ 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, int len, int iov_offset); -int qemu_sendv(int sockfd, struct iovec *iov, int len, int iov_offset); +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); /* Error handling. */