[Qemu-devel] [PULL 03/58] util: fix some coding style issue

[Paolo Bonzini]

From: Cao jin <caoj.f...@cn.fujitsu.com>

Fix some coding style issues found in removing NonBlockingConnectHandler.

Cc: Daniel P. Berrange <berra...@redhat.com>
Cc: Gerd Hoffmann <kra...@redhat.com>
Cc: Paolo Bonzini <pbonz...@redhat.com>

Reviwed-by: Daniel P. Berrange <berra...@redhat.com>
Signed-off-by: Cao jin <caoj.f...@cn.fujitsu.com>
Message-Id: <1469696074-12744-3-git-send-email-caoj.f...@cn.fujitsu.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
 util/qemu-sockets.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 9fa0156..6db48b3 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -494,7 +494,7 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr,
     if ((rc = getaddrinfo(addr, port, &ai, &peer)) != 0) {
         error_setg(errp, "address resolution failed for %s:%s: %s", addr, port,
                    gai_strerror(rc));
-       goto err;
+        goto err;
     }
 
     /* lookup local addr */
@@ -548,12 +548,16 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr,
     return sock;
 
 err:
-    if (-1 != sock)
+    if (sock != -1) {
         closesocket(sock);
-    if (local)
+    }
+    if (local) {
         freeaddrinfo(local);
-    if (peer)
+    }
+    if (peer) {
         freeaddrinfo(peer);
+    }
+
     return -1;
 }
 
@@ -816,8 +820,10 @@ int unix_listen(const char *str, char *ostr, int olen, 
Error **errp)
 
     sock = unix_listen_saddr(saddr, true, errp);
 
-    if (sock != -1 && ostr)
+    if (sock != -1 && ostr) {
         snprintf(ostr, olen, "%s%s", saddr->path, optstr ? optstr : "");
+    }
+
     qapi_free_UnixSocketAddress(saddr);
     return sock;
 }
-- 
1.8.3.1