[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 9/9] ui: rename vnc_init_state to vnc_start_protocol
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH 9/9] ui: rename vnc_init_state to vnc_start_protocol |
Date: |
Thu, 29 Sep 2016 16:45:40 +0100 |
Rename the vnc_init_state method to reflect what its actual
purpose is, to discourage future devs from using it for more
general state initialization.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
ui/vnc-ws.c | 2 +-
ui/vnc.c | 4 ++--
ui/vnc.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index 3bac46e..42a8e7b 100644
--- a/ui/vnc-ws.c
+++ b/ui/vnc-ws.c
@@ -92,7 +92,7 @@ static void vncws_handshake_done(Object *source,
vnc_client_error(vs);
} else {
VNC_DEBUG("Websock handshake complete, starting VNC protocol\n");
- vnc_init_state(vs);
+ vnc_start_protocol(vs);
vs->ioc_tag = qio_channel_add_watch(
vs->ioc, G_IO_IN, vnc_client_io, vs, NULL);
}
diff --git a/ui/vnc.c b/ui/vnc.c
index c10a003..c1e98fb 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3065,7 +3065,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket
*sioc,
graphic_hw_update(vd->dcl.con);
if (!vs->websocket) {
- vnc_init_state(vs);
+ vnc_start_protocol(vs);
}
if (vd->num_connecting > vd->connections_limit) {
@@ -3078,7 +3078,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket
*sioc,
}
}
-void vnc_init_state(VncState *vs)
+void vnc_start_protocol(VncState *vs)
{
vnc_write(vs, "RFB 003.008\n", 12);
vnc_flush(vs);
diff --git a/ui/vnc.h b/ui/vnc.h
index e48e155..d20b154 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -515,7 +515,7 @@ void vnc_write_u8(VncState *vs, uint8_t value);
void vnc_flush(VncState *vs);
void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting);
void vnc_disconnect_finish(VncState *vs);
-void vnc_init_state(VncState *vs);
+void vnc_start_protocol(VncState *vs);
/* Buffer I/O functions */
--
2.7.4
- [Qemu-devel] [PATCH 0/9] Misc VNC server code cleanups, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 1/9] ui: remove misleading comment from vnc_init_state, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 2/9] ui: remove 'enabled' and 'ws_enabled' fields from VncState, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 3/9] ui: remove 'ws_tls' field from VncState, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 5/9] ui: refactor method for setting up VncDisplay auth types, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 4/9] ui: rename misleading 'VncDisplay' variables, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 7/9] ui: remove bogus call to reset_keys() in vnc_init_state, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 8/9] ui: move some initialization out of vnc_init_state, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 6/9] ui: remove bogus call to graphic_hw_update() in vnc_listen_io, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 9/9] ui: rename vnc_init_state to vnc_start_protocol,
Daniel P. Berrange <=