aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-01-22 12:28:33 +0100
committerMichael Tokarev <mjt@tls.msk.ru>2016-02-11 15:15:46 +0300
commit58c652c08acaabcf5f22d33021d9ffeae2f59263 (patch)
treef43dc83a01e65dd2da2670c956f7b7422425e2c3 /util
parent945123a554c39b68f38cec87403de1f783a86906 (diff)
downloadqemu-58c652c08acaabcf5f22d33021d9ffeae2f59263.zip
qemu-58c652c08acaabcf5f22d33021d9ffeae2f59263.tar.gz
qemu-58c652c08acaabcf5f22d33021d9ffeae2f59263.tar.bz2
qemu-sockets: simplify error handling
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>
Diffstat (limited to 'util')
-rw-r--r--util/qemu-sockets.c6
1 files 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 */