ui: rename vnc_init_state to vnc_start_protocol

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 <berrange@redhat.com>
Message-id: 1475163940-26094-10-git-send-email-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index 3bac46e7741089ac8156a91633962cf93eba784e..42a8e7be5c67126746dbae3dc8488a837dca4365 100644 (file)
--- 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 c10a003b88a4696aaef72e36b399846ac1714e13..c1e98fb6bfb1fb38eb4d4a3a2ec3f869f535196e 100644 (file)
--- 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 e48e155ce4e042f5b6796dbc0a023c5175851b6a..d20b154a775d0403845ff473662ecbdaf33ffc16 100644 (file)
--- 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 */