diff mbox

[1/2] vnc: Drop superfluous conditionals around g_free()

Message ID 1402072618-7103-2-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster June 6, 2014, 4:36 p.m. UTC 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 ui/vnc-tls.c |  6 ++----
 ui/vnc.c     | 12 ++++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

Comments

Eric Blake June 6, 2014, 4:45 p.m. UTC | #1 
On 06/06/2014 10:36 AM, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  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);

Makes a dead store to *cred more obvious.
diff mbox

Patch

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);
     }