aboutsummaryrefslogtreecommitdiff
path: root/ui/vnc.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2014-06-06 18:47:43 +0200
committerGerd Hoffmann <kraxel@redhat.com>2014-06-19 12:48:07 +0200
commit64641d876466333b833e8a188a46e2e06c008bac (patch)
tree6a1590a2231e79c6eb1a95e9fca4190744f571b4 /ui/vnc.c
parentd279279e2b5cd40dbcc863fb66a695990f304077 (diff)
vnc: Drop superfluous conditionals around g_free()
Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui/vnc.c')
-rw-r--r--ui/vnc.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/ui/vnc.c b/ui/vnc.c
index 1684206184..d771a2cd4f 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2972,10 +2972,8 @@ static void vnc_display_close(DisplayState *ds)
if (!vs)
return;
- if (vs->display) {
- g_free(vs->display);
- vs->display = NULL;
- }
+ 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,10 +3008,8 @@ int vnc_display_password(DisplayState *ds, const char *password)
return -EINVAL;
}
- if (vs->password) {
- g_free(vs->password);
- vs->password = NULL;
- }
+ g_free(vs->password);
+ vs->password = NULL;
if (password) {
vs->password = g_strdup(password);
}