Commit dbee9897 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Gerd Hoffmann
Browse files

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: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-id: 1475163940-26094-10-git-send-email-berrange@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 90cd03a3

ui/vnc-ws.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

ui/vnc.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

ui/vnc.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */