From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMZtS-0001F4-6c for qemu-devel@nongnu.org; Fri, 22 Jan 2016 06:28:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMZtP-0005jt-1P for qemu-devel@nongnu.org; Fri, 22 Jan 2016 06:28:42 -0500 Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 22 Jan 2016 12:28:33 +0100 Message-Id: <1453462113-27119-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] qemu-sockets: simplify error handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Just go always through the err label. (Noticed because Coverity complains that peer is always non-NULL in the error cleanup code, but removing the "if" is arguably more prone to introducing the opposite bug in the future). Signed-off-by: Paolo Bonzini --- util/qemu-sockets.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index f455a17..a9fed00 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -464,7 +464,7 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr, if (err) { error_propagate(errp, err); - return -1; + goto err; } addr = sraddr->host; @@ -474,13 +474,13 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr, } if (port == NULL || strlen(port) == 0) { error_setg(errp, "remote port not specified"); - return -1; + goto err; } if (0 != (rc = getaddrinfo(addr, port, &ai, &peer))) { error_setg(errp, "address resolution failed for %s:%s: %s", addr, port, gai_strerror(rc)); - return -1; + goto err; } /* lookup local addr */ -- 2.5.0