[Qemu-devel] [PATCH v2 0/2] vnc: Drop some superfluous conditionals

[Qemu-devel] [PATCH v2 0/2] vnc: Drop some superfluous conditionals

[Markus Armbruster]

Markus Armbruster (2):
  vnc: Drop superfluous conditionals around g_free()
  vnc: Drop superfluous conditionals around g_strdup()

 ui/vnc-tls.c |  6 ++----
 ui/vnc.c     | 15 ++++-----------
 2 files changed, 6 insertions(+), 15 deletions(-)

-- 
1.9.3

[Qemu-devel] [PATCH v2 1/2] vnc: Drop superfluous conditionals around g_free()

[Markus Armbruster]

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);
 
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.9.3

Re: [Qemu-devel] [PATCH v2 1/2] vnc: Drop superfluous conditionals around g_free()

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 799 bytes --]

On 06/06/2014 10:47 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);

Still a dead store

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH v2 1/2] vnc: Drop superfluous conditionals around g_free()

[Markus Armbruster]

Eric Blake <eblake@redhat.com> writes:

> On 06/06/2014 10:47 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);
>
> Still a dead store

No deader than before my patch :)

Still, it's as good an opportunity to drop it as any.  Gerd, would you
like a v3?

Re: [Qemu-devel] [PATCH v2 1/2] vnc: Drop superfluous conditionals around g_free()

[Gerd Hoffmann]

> >> +    *cred = NULL;
> >>  
> >>      *cred = g_malloc(strlen(certdir) + strlen(filename) + 2);
> >
> > Still a dead store
> 
> No deader than before my patch :)
> 
> Still, it's as good an opportunity to drop it as any.  Gerd, would you
> like a v3?

It's an improvement in any case, so I'm not going to reject it.
Nevertheless a v3 would be nice though.

cheers,
  Gerd

[Qemu-devel] [PATCH v2 2/2] vnc: Drop superfluous conditionals around g_strdup()

[Markus Armbruster]

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 ui/vnc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ui/vnc.c b/ui/vnc.c
index d771a2c..6c9d4f3 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3009,10 +3009,7 @@ int vnc_display_password(DisplayState *ds, const char *password)
     }
 
     g_free(vs->password);
-    vs->password = NULL;
-    if (password) {
-        vs->password = g_strdup(password);
-    }
+    vs->password = g_strdup(password);
 
     return 0;
 }
-- 
1.9.3

Re: [Qemu-devel] [PATCH v2 2/2] vnc: Drop superfluous conditionals around g_strdup()

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

On 06/06/2014 10:47 AM, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  ui/vnc.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH v2 0/2] vnc: Drop some superfluous conditionals

[Gerd Hoffmann]

On Fr, 2014-06-06 at 18:47 +0200, Markus Armbruster wrote:
> Markus Armbruster (2):
>   vnc: Drop superfluous conditionals around g_free()
>   vnc: Drop superfluous conditionals around g_strdup()
> 
>  ui/vnc-tls.c |  6 ++----
>  ui/vnc.c     | 15 ++++-----------
>  2 files changed, 6 insertions(+), 15 deletions(-)
> 
Picked them up.

thanks,
  Gerd

Re: [Qemu-devel] [PATCH v2 0/2] vnc: Drop some superfluous conditionals

[Markus Armbruster]

Gerd Hoffmann <kraxel@redhat.com> writes:

> On Fr, 2014-06-06 at 18:47 +0200, Markus Armbruster wrote:
>> Markus Armbruster (2):
>>   vnc: Drop superfluous conditionals around g_free()
>>   vnc: Drop superfluous conditionals around g_strdup()
>> 
>>  ui/vnc-tls.c |  6 ++----
>>  ui/vnc.c     | 15 ++++-----------
>>  2 files changed, 6 insertions(+), 15 deletions(-)
>> 
> Picked them up.

Thanks!

I'll drop the dead store Eric noted in a followup patch, unless you
squash it in (fine with me).