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>
This commit is contained in:
parent
945123a554
commit
58c652c08a
|
@ -459,7 +459,7 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr,
|
||||||
|
|
||||||
if (err) {
|
if (err) {
|
||||||
error_propagate(errp, err);
|
error_propagate(errp, err);
|
||||||
return -1;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
addr = sraddr->host;
|
addr = sraddr->host;
|
||||||
|
@ -469,13 +469,13 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr,
|
||||||
}
|
}
|
||||||
if (port == NULL || strlen(port) == 0) {
|
if (port == NULL || strlen(port) == 0) {
|
||||||
error_setg(errp, "remote port not specified");
|
error_setg(errp, "remote port not specified");
|
||||||
return -1;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (0 != (rc = getaddrinfo(addr, port, &ai, &peer))) {
|
if (0 != (rc = getaddrinfo(addr, port, &ai, &peer))) {
|
||||||
error_setg(errp, "address resolution failed for %s:%s: %s", addr, port,
|
error_setg(errp, "address resolution failed for %s:%s: %s", addr, port,
|
||||||
gai_strerror(rc));
|
gai_strerror(rc));
|
||||||
return -1;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* lookup local addr */
|
/* lookup local addr */
|
||||||
|
|
Loading…
Reference in New Issue