[Qemu-devel] [PATCH] audio: Drop superfluous conditionals around g_free()

[Qemu-devel] [PATCH] audio: Drop superfluous conditionals around g_free()

[Markus Armbruster]

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 audio/alsaaudio.c      | 12 ++++--------
 audio/audio_template.h | 15 ++++-----------
 audio/ossaudio.c       |  6 ++----
 hw/audio/adlib.c       |  4 +---
 4 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index e4e5442..74ead97 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -815,10 +815,8 @@ static void alsa_fini_out (HWVoiceOut *hw)
     ldebug ("alsa_fini\n");
     alsa_anal_close (&alsa->handle, &alsa->pollhlp);
 
-    if (alsa->pcm_buf) {
-        g_free (alsa->pcm_buf);
-        alsa->pcm_buf = NULL;
-    }
+    g_free(alsa->pcm_buf);
+    alsa->pcm_buf = NULL;
 }
 
 static int alsa_init_out (HWVoiceOut *hw, struct audsettings *as)
@@ -978,10 +976,8 @@ static void alsa_fini_in (HWVoiceIn *hw)
 
     alsa_anal_close (&alsa->handle, &alsa->pollhlp);
 
-    if (alsa->pcm_buf) {
-        g_free (alsa->pcm_buf);
-        alsa->pcm_buf = NULL;
-    }
+    g_free(alsa->pcm_buf);
+    alsa->pcm_buf = NULL;
 }
 
 static int alsa_run_in (HWVoiceIn *hw)
diff --git a/audio/audio_template.h b/audio/audio_template.h
index 16f7880..8173188 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -71,10 +71,7 @@ static void glue (audio_init_nb_voices_, TYPE) (struct audio_driver *drv)
 
 static void glue (audio_pcm_hw_free_resources_, TYPE) (HW *hw)
 {
-    if (HWBUF) {
-        g_free (HWBUF);
-    }
-
+    g_free (HWBUF);
     HWBUF = NULL;
 }
 
@@ -92,9 +89,7 @@ static int glue (audio_pcm_hw_alloc_resources_, TYPE) (HW *hw)
 
 static void glue (audio_pcm_sw_free_resources_, TYPE) (SW *sw)
 {
-    if (sw->buf) {
-        g_free (sw->buf);
-    }
+    g_free (sw->buf);
 
     if (sw->rate) {
         st_rate_stop (sw->rate);
@@ -172,10 +167,8 @@ static int glue (audio_pcm_sw_init_, TYPE) (
 static void glue (audio_pcm_sw_fini_, TYPE) (SW *sw)
 {
     glue (audio_pcm_sw_free_resources_, TYPE) (sw);
-    if (sw->name) {
-        g_free (sw->name);
-        sw->name = NULL;
-    }
+    g_free (sw->name);
+    sw->name = NULL;
 }
 
 static void glue (audio_pcm_hw_add_sw_, TYPE) (HW *hw, SW *sw)
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 5a73716..4db2ca6 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -736,10 +736,8 @@ static void oss_fini_in (HWVoiceIn *hw)
 
     oss_anal_close (&oss->fd);
 
-    if (oss->pcm_buf) {
-        g_free (oss->pcm_buf);
-        oss->pcm_buf = NULL;
-    }
+    g_free(oss->pcm_buf);
+    oss->pcm_buf = NULL;
 }
 
 static int oss_run_in (HWVoiceIn *hw)
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 5dd739e..656eb37 100644
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -275,9 +275,7 @@ static void Adlib_fini (AdlibState *s)
     }
 #endif
 
-    if (s->mixbuf) {
-        g_free (s->mixbuf);
-    }
+    g_free(s->mixbuf);
 
     s->active = 0;
     s->enabled = 0;
-- 
1.9.3

Re: [Qemu-devel] [PATCH] audio: Drop superfluous conditionals around g_free()

[Eric Blake]

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

On 06/06/2014 10:35 AM, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  audio/alsaaudio.c      | 12 ++++--------
>  audio/audio_template.h | 15 ++++-----------
>  audio/ossaudio.c       |  6 ++----
>  hw/audio/adlib.c       |  4 +---
>  4 files changed, 11 insertions(+), 26 deletions(-)
> 

> +++ b/audio/audio_template.h
> @@ -71,10 +71,7 @@ static void glue (audio_init_nb_voices_, TYPE) (struct audio_driver *drv)
>  
>  static void glue (audio_pcm_hw_free_resources_, TYPE) (HW *hw)
>  {
> -    if (HWBUF) {
> -        g_free (HWBUF);
> -    }
> -
> +    g_free (HWBUF);

While touching this, you may want to drop the space.

> @@ -92,9 +89,7 @@ static int glue (audio_pcm_hw_alloc_resources_, TYPE) (HW *hw)
>  
>  static void glue (audio_pcm_sw_free_resources_, TYPE) (SW *sw)
>  {
> -    if (sw->buf) {
> -        g_free (sw->buf);
> -    }
> +    g_free (sw->buf);

here too.

> @@ -172,10 +167,8 @@ static int glue (audio_pcm_sw_init_, TYPE) (
>  static void glue (audio_pcm_sw_fini_, TYPE) (SW *sw)
>  {
>      glue (audio_pcm_sw_free_resources_, TYPE) (sw);
> -    if (sw->name) {
> -        g_free (sw->name);
> -        sw->name = NULL;
> -    }
> +    g_free (sw->name);
> +    sw->name = NULL;

hmm, it looks like that style is pervasive in this file.

> +++ b/audio/ossaudio.c
> @@ -736,10 +736,8 @@ static void oss_fini_in (HWVoiceIn *hw)
>  
>      oss_anal_close (&oss->fd);
>  
> -    if (oss->pcm_buf) {
> -        g_free (oss->pcm_buf);
> -        oss->pcm_buf = NULL;
> -    }
> +    g_free(oss->pcm_buf);
> +    oss->pcm_buf = NULL;

Here, you DID trim the space.  Be consistent - either preserve the
original spacing, or clean it up everywhere.

At any rate, whitespace is trivial, so either way:

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] audio: Drop superfluous conditionals around g_free()

[Markus Armbruster]

Eric Blake <eblake@redhat.com> writes:

> On 06/06/2014 10:35 AM, Markus Armbruster wrote:
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  audio/alsaaudio.c      | 12 ++++--------
>>  audio/audio_template.h | 15 ++++-----------
>>  audio/ossaudio.c       |  6 ++----
>>  hw/audio/adlib.c       |  4 +---
>>  4 files changed, 11 insertions(+), 26 deletions(-)
>> 
>
>> +++ b/audio/audio_template.h
>> @@ -71,10 +71,7 @@ static void glue (audio_init_nb_voices_, TYPE) (struct audio_driver *drv)
>>  
>>  static void glue (audio_pcm_hw_free_resources_, TYPE) (HW *hw)
>>  {
>> -    if (HWBUF) {
>> -        g_free (HWBUF);
>> -    }
>> -
>> +    g_free (HWBUF);
>
> While touching this, you may want to drop the space.
>
>> @@ -92,9 +89,7 @@ static int glue (audio_pcm_hw_alloc_resources_,
>> TYPE) (HW *hw)
>>  
>>  static void glue (audio_pcm_sw_free_resources_, TYPE) (SW *sw)
>>  {
>> -    if (sw->buf) {
>> -        g_free (sw->buf);
>> -    }
>> +    g_free (sw->buf);
>
> here too.
>
>> @@ -172,10 +167,8 @@ static int glue (audio_pcm_sw_init_, TYPE) (
>>  static void glue (audio_pcm_sw_fini_, TYPE) (SW *sw)
>>  {
>>      glue (audio_pcm_sw_free_resources_, TYPE) (sw);
>> -    if (sw->name) {
>> -        g_free (sw->name);
>> -        sw->name = NULL;
>> -    }
>> +    g_free (sw->name);
>> +    sw->name = NULL;
>
> hmm, it looks like that style is pervasive in this file.

All files are equal in coding style, but some files are more equal than
others.

Specifically, audio/ and hw/audio/.

>> +++ b/audio/ossaudio.c
>> @@ -736,10 +736,8 @@ static void oss_fini_in (HWVoiceIn *hw)
>>  
>>      oss_anal_close (&oss->fd);
>>  
>> -    if (oss->pcm_buf) {
>> -        g_free (oss->pcm_buf);
>> -        oss->pcm_buf = NULL;
>> -    }
>> +    g_free(oss->pcm_buf);
>> +    oss->pcm_buf = NULL;
>
> Here, you DID trim the space.  Be consistent - either preserve the
> original spacing, or clean it up everywhere.

I meant to stick to the audio style, but fingers overruled brain here.

> At any rate, whitespace is trivial, so either way:
>
> Reviewed-by: Eric Blake <eblake@redhat.com>

Gerd, should patches for audio/ conform to the usual style now, or are
they still special?

Re: [Qemu-devel] [PATCH] audio: Drop superfluous conditionals around g_free()

[Gerd Hoffmann]

  Hi,

> Gerd, should patches for audio/ conform to the usual style now, or are
> they still special?

I don't consider them special.  If you use usual qemu style in patches
that is fine with me.  But I don't feel like doing a conversion pass,
that simply isn't worth the trouble IMO.

cheers,
  Gerd

Re: [Qemu-devel] [PATCH] audio: Drop superfluous conditionals around g_free()

[Gerd Hoffmann]

On Fr, 2014-06-06 at 18:35 +0200, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  audio/alsaaudio.c      | 12 ++++--------
>  audio/audio_template.h | 15 ++++-----------
>  audio/ossaudio.c       |  6 ++----
>  hw/audio/adlib.c       |  4 +---
>  4 files changed, 11 insertions(+), 26 deletions(-)

picked up.

thanks,
  Gerd