From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxa8R-0005Qd-BW for qemu-devel@nongnu.org; Thu, 19 Jun 2014 07:04:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wxa8L-0000sR-6z for qemu-devel@nongnu.org; Thu, 19 Jun 2014 07:04:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32765) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxa8K-0000sF-Uy for qemu-devel@nongnu.org; Thu, 19 Jun 2014 07:03:57 -0400 From: Gerd Hoffmann Date: Thu, 19 Jun 2014 13:03:47 +0200 Message-Id: <1403175829-24595-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1403175829-24595-1-git-send-email-kraxel@redhat.com> References: <1403175829-24595-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 1/3] vnc: Drop superfluous conditionals around g_free() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Anthony Liguori , Gerd Hoffmann From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Gerd Hoffmann --- ui/vnc-tls.c | 6 ++---- ui/vnc.c | 12 ++++-------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c index 50275de..6392326 100644 --- a/ui/vnc-tls.c +++ b/ui/vnc-tls.c @@ -443,10 +443,8 @@ static int vnc_set_x509_credential(VncDisplay *vd, { struct stat sb; - if (*cred) { - g_free(*cred); - *cred = NULL; - } + g_free(*cred); + *cred = NULL; *cred = g_malloc(strlen(certdir) + strlen(filename) + 2); diff --git a/ui/vnc.c b/ui/vnc.c index 1684206..d771a2c 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); } -- 1.8.3.1