From: Michael Tokarev <mjt@tls.msk.ru>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>,
Michael Tokarev <mjt@tls.msk.ru>
Subject: [Qemu-devel] [PULL 05/14] qemu-sockets: simplify error handling
Date: Thu, 11 Feb 2016 15:18:54 +0300 [thread overview]
Message-ID: <58c652c08acaabcf5f22d33021d9ffeae2f59263.1455192968.git.mjt@msgid.tls.msk.ru> (raw)
In-Reply-To: <cover.1455192968.git.mjt@msgid.tls.msk.ru>
From: Paolo Bonzini <pbonzini@redhat.com>
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 <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
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 b665cdb..557da20 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -459,7 +459,7 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr,
if (err) {
error_propagate(errp, err);
- return -1;
+ goto err;
}
addr = sraddr->host;
@@ -469,13 +469,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.1.4
next prev parent reply other threads:[~2016-02-11 12:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-11 12:18 [Qemu-devel] [PULL 00/14] Trivial patches for 2016-02-11 Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 01/14] remove libtool support Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 02/14] man: virtfs-proxy-helper: Rework awkward sentence Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 03/14] qom: Correct object_property_get_int() description Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 04/14] cpu: cpu_save/cpu_load is no more Michael Tokarev
2016-02-11 12:18 ` Michael Tokarev [this message]
2016-02-11 12:18 ` [Qemu-devel] [PULL 06/14] rdma: remove check on time_spent when calculating mbs Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 07/14] qmp-spec: fix index in doc Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 08/14] char: fix parameter name / type in BSD codepath Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 09/14] ES1370: QOMify Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 10/14] Emulated CCID card: QOMify Michael Tokarev
2016-02-11 12:19 ` [Qemu-devel] [PULL 11/14] Passthru " Michael Tokarev
2016-02-11 12:19 ` [Qemu-devel] [PULL 12/14] s390x: remove s390-zipl.rom Michael Tokarev
2016-02-11 12:19 ` [Qemu-devel] [PULL 13/14] Adds keycode 86 to the hid_usage_keys translation table Michael Tokarev
2016-02-11 12:19 ` [Qemu-devel] [PULL 14/14] w32: include winsock2.h before windows.h Michael Tokarev
2016-02-11 17:08 ` [Qemu-devel] [PULL 00/14] Trivial patches for 2016-02-11 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=58c652c08acaabcf5f22d33021d9ffeae2f59263.1455192968.git.mjt@msgid.tls.msk.ru \
--to=mjt@tls.msk.ru \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).