Skip to content

Commit

Permalink
qemu-sockets: simplify error handling
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bonzini authored and Michael Tokarev committed Feb 11, 2016
1 parent 945123a commit 58c652c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions util/qemu-sockets.c
Expand Up @@ -459,7 +459,7 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr,

if (err) {
error_propagate(errp, err);
return -1;
goto err;
}

addr = sraddr->host;
Expand All @@ -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 */
Expand Down

0 comments on commit 58c652c

Please sign in to comment.