[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 05/14] qemu-sockets: simplify error handling
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 05/14] qemu-sockets: simplify error handling |
Date: |
Thu, 11 Feb 2016 15:18:54 +0300 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
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
- [Qemu-trivial] [PULL 11/14] Passthru CCID card: QOMify, (continued)
- [Qemu-trivial] [PULL 11/14] Passthru CCID card: QOMify, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 02/14] man: virtfs-proxy-helper: Rework awkward sentence, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 08/14] char: fix parameter name / type in BSD codepath, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 03/14] qom: Correct object_property_get_int() description, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 07/14] qmp-spec: fix index in doc, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 13/14] Adds keycode 86 to the hid_usage_keys translation table., Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 12/14] s390x: remove s390-zipl.rom, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 14/14] w32: include winsock2.h before windows.h, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 06/14] rdma: remove check on time_spent when calculating mbs, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 10/14] Emulated CCID card: QOMify, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 05/14] qemu-sockets: simplify error handling,
Michael Tokarev <=
- [Qemu-trivial] [PULL 04/14] cpu: cpu_save/cpu_load is no more, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 09/14] ES1370: QOMify, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 01/14] remove libtool support, Michael Tokarev, 2016/02/11
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/14] Trivial patches for 2016-02-11, Peter Maydell, 2016/02/11