Commit 9d3c5120 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20140619-1' into staging 



vnc: cleanups and fixes

# gpg: Signature made Thu 19 Jun 2014 12:02:09 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-vnc-20140619-1:
  vnc: fix screen updates
  vnc: Drop superfluous conditionals around g_strdup()
  vnc: Drop superfluous conditionals around g_free()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e8e23b7d eb214ff8

ui/vnc-tls.c

+2 −4
Original line number Diff line number Diff line
@@ -443,10 +443,8 @@ static int vnc_set_x509_credential(VncDisplay *vd, 
{

    struct stat sb;



    if (*cred) {

    g_free(*cred);

    *cred = NULL;

    }



    *cred = g_malloc(strlen(certdir) + strlen(filename) + 2);

ui/vnc.c

+7 −11
Original line number Diff line number Diff line
@@ -935,6 +935,9 @@ static int vnc_update_client(VncState *vs, int has_dirty, bool sync) 
        }



        vnc_job_push(job);

        if (sync) {

            vnc_jobs_join(vs);

        }

        vs->force_update = 0;

        return n;

    }
@@ -2972,10 +2975,8 @@ static void vnc_display_close(DisplayState *ds) 


    if (!vs)

        return;

    if (vs->display) {

    g_free(vs->display);

    vs->display = NULL;

    }

    if (vs->lsock != -1) {

        qemu_set_fd_handler2(vs->lsock, NULL, NULL, NULL, NULL);

        close(vs->lsock);
@@ -3010,13 +3011,8 @@ int vnc_display_password(DisplayState *ds, const char *password) 
        return -EINVAL;

    }



    if (vs->password) {

    g_free(vs->password);

        vs->password = NULL;

    }

    if (password) {

    vs->password = g_strdup(password);

    }



    return 0;

}