From patchwork Thu Jul 28 07:39:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao jin X-Patchwork-Id: 653617 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3s0Nrv2Zp1z9svs for ; Thu, 28 Jul 2016 17:33:50 +1000 (AEST) Received: from localhost ([::1]:51407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSfpD-00042k-35 for incoming@patchwork.ozlabs.org; Thu, 28 Jul 2016 03:33:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSfnv-0002Gx-55 for qemu-devel@nongnu.org; Thu, 28 Jul 2016 03:32:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSfno-00080j-PM for qemu-devel@nongnu.org; Thu, 28 Jul 2016 03:32:26 -0400 Received: from [59.151.112.132] (port=34571 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSfnn-0007zN-I9 for qemu-devel@nongnu.org; Thu, 28 Jul 2016 03:32:20 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="9222003" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Jul 2016 15:32:01 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id B471842984F5; Thu, 28 Jul 2016 15:31:58 +0800 (CST) Received: from G08FNSTD140223.g08.fujitsu.local (10.167.226.69) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.279.2; Thu, 28 Jul 2016 15:31:57 +0800 From: Cao jin To: Date: Thu, 28 Jul 2016 15:39:30 +0800 Message-ID: <1469691571-10819-3-git-send-email-caoj.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1469691571-10819-1-git-send-email-caoj.fnst@cn.fujitsu.com> References: <1469691571-10819-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.69] X-yoursite-MailScanner-ID: B471842984F5.AAF0B X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: caoj.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH 2/3] util: fix some coding style issue X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Fix some coding style issues found in removing NonBlockingConnectHandler. Cc: Daniel P. Berrange Cc: Gerd Hoffmann Cc: Paolo Bonzini Signed-off-by: Cao jin --- util/qemu-sockets.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index cd4ed55..b2ef066 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -389,7 +389,7 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr, if (0 != (rc = getaddrinfo(addr, port, &ai, &peer))) { error_setg(errp, "address resolution failed for %s:%s: %s", addr, port, gai_strerror(rc)); - goto err; + goto err; } /* lookup local addr */ @@ -443,12 +443,16 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr, return sock; err: - if (-1 != sock) + if (-1 != sock) { closesocket(sock); - if (local) + } + if (local) { freeaddrinfo(local); - if (peer) + } + if (peer) { freeaddrinfo(peer); + } + return -1; } @@ -690,8 +694,10 @@ int unix_listen(const char *str, char *ostr, int olen, Error **errp) sock = unix_listen_saddr(saddr, true, errp); - if (sock != -1 && ostr) + if (sock != -1 && ostr) { snprintf(ostr, olen, "%s%s", saddr->path, optstr ? optstr : ""); + } + qapi_free_UnixSocketAddress(saddr); return sock; }