From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adqSA-0000MN-8j for qemu-devel@nongnu.org; Wed, 09 Mar 2016 21:35:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adqS6-0005hz-5n for qemu-devel@nongnu.org; Wed, 09 Mar 2016 21:35:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54671) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adqS6-0005hv-1A for qemu-devel@nongnu.org; Wed, 09 Mar 2016 21:35:50 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 988A2C09FA80 for ; Thu, 10 Mar 2016 02:35:49 +0000 (UTC) From: Peter Xu Date: Thu, 10 Mar 2016 10:35:25 +0800 Message-Id: <1457577325-21606-3-git-send-email-peterx@redhat.com> In-Reply-To: <1457577325-21606-1-git-send-email-peterx@redhat.com> References: <1457577325-21606-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/2] usb: trivial cleanup for usb_mtp_add_str List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, famz@redhat.com, kraxel@redhat.com, peterx@redhat.com Remove useless var "ret". Signed-off-by: Peter Xu --- hw/usb/dev-mtp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 62fb7cd..3c11148 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -719,10 +719,8 @@ static void usb_mtp_add_str(MTPData *data, const char *str) { uint32_t len = strlen(str)+1; wchar_t *wstr = g_new(wchar_t, len); - size_t ret; - ret = mbstowcs(wstr, str, len); - if (ret == -1) { + if (mbstowcs(wstr, str, len) == -1) { usb_mtp_add_wstr(data, L"Oops"); } else { usb_mtp_add_wstr(data, wstr); -- 2.4.3