* [Qemu-devel] [PATCH v2] util/qemu-sockets: revert Yoda Conditions to normal
@ 2016-07-29 2:15 Cao jin
2016-07-29 9:20 ` Daniel P. Berrange
0 siblings, 1 reply; 3+ messages in thread
From: Cao jin @ 2016-07-29 2:15 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Daniel P. Berrange, Gerd Hoffmann, Paolo Bonzini,
Eric Blake
Follow CODING_STYLE
Cc: Daniel P. Berrange <berrange@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
util/qemu-sockets.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
v2 changelog:
1. fix to Eric's comments.
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 5e08723..2d48629 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -386,7 +386,8 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr,
goto err;
}
- if (0 != (rc = getaddrinfo(addr, port, &ai, &peer))) {
+ rc = getaddrinfo(addr, port, &ai, &peer);
+ if (rc != 0) {
error_setg(errp, "address resolution failed for %s:%s: %s", addr, port,
gai_strerror(rc));
goto err;
@@ -412,7 +413,8 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr,
port = "0";
}
- if (0 != (rc = getaddrinfo(addr, port, &ai, &local))) {
+ rc = getaddrinfo(addr, port, &ai, &local);
+ if (rc != 0) {
error_setg(errp, "address resolution failed for %s:%s: %s", addr, port,
gai_strerror(rc));
goto err;
@@ -472,20 +474,20 @@ InetSocketAddress *inet_parse(const char *str, Error **errp)
if (str[0] == ':') {
/* no host given */
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);
goto fail;
}
} else if (str[0] == '[') {
/* 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);
goto fail;
}
addr->ipv6 = addr->has_ipv6 = true;
} else {
/* 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);
goto fail;
}
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH v2] util/qemu-sockets: revert Yoda Conditions to normal
2016-07-29 2:15 [Qemu-devel] [PATCH v2] util/qemu-sockets: revert Yoda Conditions to normal Cao jin
@ 2016-07-29 9:20 ` Daniel P. Berrange
2016-08-01 9:54 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Daniel P. Berrange @ 2016-07-29 9:20 UTC (permalink / raw)
To: Cao jin
Cc: qemu-devel, qemu-trivial, Gerd Hoffmann, Paolo Bonzini, Eric Blake
On Fri, Jul 29, 2016 at 10:15:46AM +0800, Cao jin wrote:
> Follow CODING_STYLE
>
> Cc: Daniel P. Berrange <berrange@redhat.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Eric Blake <eblake@redhat.com>
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
> util/qemu-sockets.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> v2 changelog:
> 1. fix to Eric's comments.
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH v2] util/qemu-sockets: revert Yoda Conditions to normal
2016-07-29 9:20 ` Daniel P. Berrange
@ 2016-08-01 9:54 ` Paolo Bonzini
0 siblings, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2016-08-01 9:54 UTC (permalink / raw)
To: Daniel P. Berrange, Cao jin
Cc: qemu-devel, qemu-trivial, Gerd Hoffmann, Eric Blake
On 29/07/2016 11:20, Daniel P. Berrange wrote:
> Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Queued, thanks for the patch and the review.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-01 9:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-29 2:15 [Qemu-devel] [PATCH v2] util/qemu-sockets: revert Yoda Conditions to normal Cao jin
2016-07-29 9:20 ` Daniel P. Berrange
2016-08-01 9:54 ` Paolo Bonzini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.