OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

util/qemu-sockets: revert Yoda Conditions to normal

Browse Source 
Follow CODING_STYLE

Cc: Daniel P. Berrange <berrange@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Message-Id: <1469703004-14800-1-git-send-email-caoj.fnst@cn.fujitsu.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Cao jin 2016-07-28 18:50:04 +08:00 committed by Paolo Bonzini
parent 3b8c1761f0
commit 9cd1883c0d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/qemu-sockets.c
View File

@ -491,7 +491,7 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr,
goto err; goto err;
} }
if (0 != (rc = getaddrinfo(addr, port, &ai, &peer))) { if ((rc = getaddrinfo(addr, port, &ai, &peer)) != 0) {
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));
goto err; goto err;
@ -517,7 +517,7 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr,
port = "0"; port = "0";
} }
if (0 != (rc = getaddrinfo(addr, port, &ai, &local))) { if ((rc = getaddrinfo(addr, port, &ai, &local)) != 0) {
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));
goto err; goto err;
@ -573,20 +573,20 @@ InetSocketAddress *inet_parse(const char *str, Error **errp)
if (str[0] == ':') { if (str[0] == ':') {
/* no host given */ /* no host given */
host[0] = '\0'; host[0] = '\0';
if (1 != sscanf(str, ":%32[^,]%n", port, &pos)) { if (sscanf(str, ":%32[^,]%n", port, &pos) != 1) {
error_setg(errp, "error parsing port in address '%s'", str); error_setg(errp, "error parsing port in address '%s'", str);
goto fail; goto fail;
} }
} else if (str[0] == '[') { } else if (str[0] == '[') {
/* IPv6 addr */ /* IPv6 addr */
if (2 != sscanf(str, "[%64[^]]]:%32[^,]%n", host, port, &pos)) { if (sscanf(str, "[%64[^]]]:%32[^,]%n", host, port, &pos) != 2) {
error_setg(errp, "error parsing IPv6 address '%s'", str); error_setg(errp, "error parsing IPv6 address '%s'", str);
goto fail; goto fail;
} }
addr->ipv6 = addr->has_ipv6 = true; addr->ipv6 = addr->has_ipv6 = true;
} else { } else {
/* hostname or IPv4 addr */ /* hostname or IPv4 addr */
if (2 != sscanf(str, "%64[^:]:%32[^,]%n", host, port, &pos)) { if (sscanf(str, "%64[^:]:%32[^,]%n", host, port, &pos) != 2) {
error_setg(errp, "error parsing address '%s'", str); error_setg(errp, "error parsing address '%s'", str);
goto fail; goto fail;
} }