[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/58] util: fix some coding style issue
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 03/58] util: fix some coding style issue |
Date: |
Tue, 13 Sep 2016 19:15:34 +0200 |
From: Cao jin <address@hidden>
Fix some coding style issues found in removing NonBlockingConnectHandler.
Cc: Daniel P. Berrange <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Reviwed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PULL 00/58] First round of misc patches for QEMU 2.8, Paolo Bonzini, 2016/09/13
- [Qemu-devel] [PULL 01/58] qtail: clean up direct access to tqe_prev field, Paolo Bonzini, 2016/09/13
- [Qemu-devel] [PULL 04/58] tcg: Pass last_tb by value to tb_find_fast(), Paolo Bonzini, 2016/09/13
- [Qemu-devel] [PULL 03/58] util: fix some coding style issue,
Paolo Bonzini <=
- [Qemu-devel] [PULL 05/58] tcg: Prepare safe tb_jmp_cache lookup out of tb_lock, Paolo Bonzini, 2016/09/13
- [Qemu-devel] [PULL 08/58] tcg: set up tb->page_addr before insertion, Paolo Bonzini, 2016/09/13
- [Qemu-devel] [PULL 02/58] util/qemu-sockets: revert Yoda Conditions to normal, Paolo Bonzini, 2016/09/13
- [Qemu-devel] [PULL 07/58] tcg: Prepare TB invalidation for lockless TB lookup, Paolo Bonzini, 2016/09/13
- [Qemu-devel] [PULL 11/58] tcg: Merge tb_find_slow() and tb_find_fast(), Paolo Bonzini, 2016/09/13
- [Qemu-devel] [PULL 09/58] tcg: cpu-exec: remove tb_lock from the hot-path, Paolo Bonzini, 2016/09/13
- [Qemu-devel] [PULL 12/58] tcg: rename tb_find_physical(), Paolo Bonzini, 2016/09/13
- [Qemu-devel] [PULL 06/58] tcg: Prepare safe access to tb_flushed out of tb_lock, Paolo Bonzini, 2016/09/13
- [Qemu-devel] [PULL 10/58] tcg: Avoid bouncing tb_lock between tb_gen_code() and tb_add_jump(), Paolo Bonzini, 2016/09/13
- [Qemu-devel] [PULL 13/58] rules.mak: Don't extract libs from .mo-libs in link command, Paolo Bonzini, 2016/09/13