diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-13 12:58:24 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-13 12:58:24 +0100 |
| commit | d61de7255b707f726447d3ed7459e18e0a4fab5b (patch) | |
| tree | 637ead7bd04678af8c72f6acaca186891a990ffa | |
| parent | 2a2c4830c0068d70443f3dddc4cc668f0c601b5c (diff) | |
| parent | fb7da626c0d178d687f439af2e19401f34bc901e (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20140613-1' into staging
audio: Drop superfluous conditionals around g_free()
# gpg: Signature made Fri 13 Jun 2014 12:14:24 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-audio-20140613-1:
audio: Drop superfluous conditionals around g_free()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | audio/alsaaudio.c | 12 | ||||
| -rw-r--r-- | audio/audio_template.h | 15 | ||||
| -rw-r--r-- | audio/ossaudio.c | 6 | ||||
| -rw-r--r-- | hw/audio/adlib.c | 4 |
4 files changed, 11 insertions, 26 deletions
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index e4e5442631..74ead97d87 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 16f7880770..817318853c 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 5a73716032..4db2ca65bf 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 5dd739e541..656eb3773a 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; |