[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/17] qemu-char: use bool in qemu_chr_open_socket an
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 13/17] qemu-char: use bool in qemu_chr_open_socket and simplify code a bit |
Date: |
Sat, 22 Jun 2013 13:24:32 +0400 |
From: liguang <address@hidden>
Local variables is_* should be bool by usage.
While at it, simplify the logic/code a bit.
Signed-off-by: liguang <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
qemu-char.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 2c3cfe6..a030e6b 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2679,19 +2679,12 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts
*opts)
CharDriverState *chr = NULL;
Error *local_err = NULL;
int fd = -1;
- int is_listen;
- int is_waitconnect;
- int do_nodelay;
- int is_unix;
- int is_telnet;
-
- is_listen = qemu_opt_get_bool(opts, "server", 0);
- is_waitconnect = qemu_opt_get_bool(opts, "wait", 1);
- is_telnet = qemu_opt_get_bool(opts, "telnet", 0);
- do_nodelay = !qemu_opt_get_bool(opts, "delay", 1);
- is_unix = qemu_opt_get(opts, "path") != NULL;
- if (!is_listen)
- is_waitconnect = 0;
+
+ bool is_listen = qemu_opt_get_bool(opts, "server", false);
+ bool is_waitconnect = is_listen && qemu_opt_get_bool(opts, "wait", true);
+ bool is_telnet = qemu_opt_get_bool(opts, "telnet", false);
+ bool do_nodelay = !qemu_opt_get_bool(opts, "delay", true);
+ bool is_unix = qemu_opt_get(opts, "path") != NULL;
if (is_unix) {
if (is_listen) {
--
1.7.10.4
- [Qemu-devel] [PULL 00/17] Trivial patches for 2013-06-22, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 01/17] vl: reformat SDL ifdeffery a bit, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 02/17] qemu-options: trivial fix for -mon args help, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 03/17] qemu-img: Add missing GCC_FMT_ATTR, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 04/17] kvm: Fix potential resource leak (missing fclose), Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 05/17] savevm: Fix potential memory leak, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 12/17] vnc: use booleans for vnc_connect, vnc_listen_read and vnc_display_add_client, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 17/17] configure: Add signed*signed check to [u]int128_t test, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 16/17] Makefile: pass include directives to dtc via CPPFLAGS, not CFLAGS, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 08/17] configure: Fix "ERROR: ERROR: " for missing/incompatible DTC, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 13/17] qemu-char: use bool in qemu_chr_open_socket and simplify code a bit,
Michael Tokarev <=
- [Qemu-devel] [PULL 07/17] audio: Replace static functions in header file by macros, remove GCC_ATTR, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 09/17] acl: acl_add can't insert before last list element, fix, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 06/17] libcacard: Fix cppcheck warning and remove unneeded code, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 15/17] qapi: lack of two commas in dict, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 10/17] qxl: Fix QXLRam initialisation., Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 14/17] sd: pass bool parameter for sd_init, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 11/17] block/nand: Formatting sweep, Michael Tokarev, 2013/06/22