From e990a3932847c45839355de72e73182a53fc75ac Mon Sep 17 00:00:00 2001 From: liguang Date: Tue, 18 Jun 2013 11:45:35 +0800 Subject: qemu-char: use bool in qemu_chr_open_socket and simplify code a bit Local variables is_* should be bool by usage. While at it, simplify the logic/code a bit. Signed-off-by: liguang Signed-off-by: Michael Tokarev --- qemu-char.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'qemu-char.c') diff --git a/qemu-char.c b/qemu-char.c index 2c3cfe6b69..a030e6b01e 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) { -- cgit v1.2.1