From patchwork Fri Jun 14 11:53:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 251410 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D1C6F2C008E for ; Fri, 14 Jun 2013 21:59:14 +1000 (EST) Received: from localhost ([::1]:57688 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnSeu-0000qb-Pq for incoming@patchwork.ozlabs.org; Fri, 14 Jun 2013 07:59:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnSaZ-0001wr-Ez for qemu-devel@nongnu.org; Fri, 14 Jun 2013 07:54:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UnSaY-00021t-EX for qemu-devel@nongnu.org; Fri, 14 Jun 2013 07:54:43 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:37609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnSaP-0001y4-Go for qemu-devel@nongnu.org; Fri, 14 Jun 2013 07:54:42 -0400 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Jun 2013 21:43:07 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp07.au.ibm.com (202.81.31.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 14 Jun 2013 21:43:05 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 58F983578056 for ; Fri, 14 Jun 2013 21:54:14 +1000 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5EBs5rh34341024 for ; Fri, 14 Jun 2013 21:54:05 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5EBsCJJ010259 for ; Fri, 14 Jun 2013 21:54:13 +1000 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.53]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5EBr4I0007536; Fri, 14 Jun 2013 21:54:11 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 14 Jun 2013 19:53:00 +0800 Message-Id: <1371210780-16258-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13061411-0260-0000-0000-0000032919AF X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.140 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, armbru@redhat.com, mlureau@redhat.com, stefanha@redhat.com, alevy@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V3] build: remove compile warning 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 This patch simply remove "variable may be used uninitialized" warning. Signed-off-by: Wenchao Xia Reviewed-by: Stefan Hajnoczi --- V2: Address Stefan and Peter's comments, use 0 in send_msg() instead of initialize mhHeader. V3: Address Markus's comments, adjust the code section in iov.c. libcacard/vscclient.c | 3 +-- util/iov.c | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c index ac23647..7fbf1da 100644 --- a/libcacard/vscclient.c +++ b/libcacard/vscclient.c @@ -641,7 +641,6 @@ main( GIOChannel *channel_stdin; char *qemu_host; char *qemu_port; - VSCMsgHeader mhHeader; VCardEmulOptions *command_line_options = NULL; @@ -750,7 +749,7 @@ main( .magic = VSCARD_MAGIC, .capabilities = {0} }; - send_msg(VSC_Init, mhHeader.reader_id, &init, sizeof(init)); + send_msg(VSC_Init, 0, &init, sizeof(init)); g_main_loop_run(loop); g_main_loop_unref(loop); diff --git a/util/iov.c b/util/iov.c index cc6e837..50938e1 100644 --- a/util/iov.c +++ b/util/iov.c @@ -181,13 +181,11 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt, assert(iov[niov].iov_len > tail); orig_len = iov[niov].iov_len; iov[niov++].iov_len = tail; - } - - ret = do_send_recv(sockfd, iov, niov, do_send); - - /* Undo the changes above before checking for errors */ - if (tail) { + ret = do_send_recv(sockfd, iov, niov, do_send); + /* Undo the changes above before checking for errors */ iov[niov-1].iov_len = orig_len; + } else { + ret = do_send_recv(sockfd, iov, niov, do_send); } if (offset) { iov[0].iov_base -= offset;