Commit d61de725 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2a2c4830 fb7da626

audio/alsaaudio.c

+4 −8
Original line number Diff line number Diff line
@@ -815,11 +815,9 @@ 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;

}

}



static int alsa_init_out (HWVoiceOut *hw, struct audsettings *as)

{
@@ -978,11 +976,9 @@ 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;

}

}



static int alsa_run_in (HWVoiceIn *hw)

{

audio/audio_template.h

+4 −11
Original line number Diff line number Diff line
@@ -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);

    }



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

    }



    if (sw->rate) {

        st_rate_stop (sw->rate);
@@ -172,11 +167,9 @@ 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;

}

}



static void glue (audio_pcm_hw_add_sw_, TYPE) (HW *hw, SW *sw)

{

audio/ossaudio.c

+2 −4
Original line number Diff line number Diff line
@@ -736,11 +736,9 @@ 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;

}

}



static int oss_run_in (HWVoiceIn *hw)

{

hw/audio/adlib.c

+1 −3
Original line number Diff line number Diff line
@@ -275,9 +275,7 @@ static void Adlib_fini (AdlibState *s) 
    }

#endif



    if (s->mixbuf) {

    g_free(s->mixbuf);

    }



    s->active = 0;

    s->enabled = 0;