There is only one caller of freeJackData() left: jack_finishDriver().
This function is called by the mpd core, and is called exactly once
for every successful jack_initDriver().  We do not need to clear
audioOutput->data, since this variable is invalidated anyway.
---

 src/audioOutputs/audioOutput_jack.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/audioOutputs/audioOutput_jack.c 
b/src/audioOutputs/audioOutput_jack.c
index 9fc5205..5e0b1b5 100644
--- a/src/audioOutputs/audioOutput_jack.c
+++ b/src/audioOutputs/audioOutput_jack.c
@@ -87,11 +87,11 @@ static void freeJackClient(JackData *jd)
 static void freeJackData(AudioOutput *audioOutput)
 {
        JackData *jd = audioOutput->data;
-       if (jd) {
-               freeJackClient(jd);
-               free(jd);
-               audioOutput->data = NULL;
-       }
+
+       assert(jd != NULL);
+
+       freeJackClient(jd);
+       free(jd);
 }
 
 static void jack_finishDriver(AudioOutput *audioOutput)


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team

Reply via email to