[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/17] vnc: use booleans for vnc_connect, vnc_listen_
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 12/17] vnc: use booleans for vnc_connect, vnc_listen_read and vnc_display_add_client |
Date: |
Sat, 22 Jun 2013 13:24:31 +0400 |
Some arguments to these functions are booleans - either by declaration,
or by actual usage, but sometimes value of 0 or 1 is passed for a bool,
and sometimes it is declared as int but a bool value, or true/false,
is passed to it instead. Clean it up a bit.
Cc: liguang <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
include/ui/console.h | 2 +-
ui/vnc.c | 15 ++++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index f1d79f9..98edf41 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -314,7 +314,7 @@ void cocoa_display_init(DisplayState *ds, int full_screen);
/* vnc.c */
void vnc_display_init(DisplayState *ds);
void vnc_display_open(DisplayState *ds, const char *display, Error **errp);
-void vnc_display_add_client(DisplayState *ds, int csock, int skipauth);
+void vnc_display_add_client(DisplayState *ds, int csock, bool skipauth);
char *vnc_display_local_addr(DisplayState *ds);
#ifdef CONFIG_VNC
int vnc_display_password(DisplayState *ds, const char *password);
diff --git a/ui/vnc.c b/ui/vnc.c
index dfc7459..5601cc3 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2771,7 +2771,8 @@ static void vnc_refresh(DisplayChangeListener *dcl)
}
}
-static void vnc_connect(VncDisplay *vd, int csock, int skipauth, bool
websocket)
+static void vnc_connect(VncDisplay *vd, int csock,
+ bool skipauth, bool websocket)
{
VncState *vs = g_malloc0(sizeof(VncState));
int i;
@@ -2883,19 +2884,19 @@ static void vnc_listen_read(void *opaque, bool
websocket)
}
if (csock != -1) {
- vnc_connect(vs, csock, 0, websocket);
+ vnc_connect(vs, csock, false, websocket);
}
}
static void vnc_listen_regular_read(void *opaque)
{
- vnc_listen_read(opaque, 0);
+ vnc_listen_read(opaque, false);
}
#ifdef CONFIG_VNC_WS
static void vnc_listen_websocket_read(void *opaque)
{
- vnc_listen_read(opaque, 1);
+ vnc_listen_read(opaque, true);
}
#endif /* CONFIG_VNC_WS */
@@ -3283,7 +3284,7 @@ void vnc_display_open(DisplayState *ds, const char
*display, Error **errp)
if (csock < 0) {
goto fail;
}
- vnc_connect(vs, csock, 0, 0);
+ vnc_connect(vs, csock, false, false);
} else {
/* listen for connects */
char *dpy;
@@ -3341,9 +3342,9 @@ fail:
#endif /* CONFIG_VNC_WS */
}
-void vnc_display_add_client(DisplayState *ds, int csock, int skipauth)
+void vnc_display_add_client(DisplayState *ds, int csock, bool skipauth)
{
VncDisplay *vs = vnc_display;
- vnc_connect(vs, csock, skipauth, 0);
+ vnc_connect(vs, csock, skipauth, false);
}
--
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 <=
- [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, 2013/06/22
- [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