diff options
| author | Max Kellermann <max@duempel.org> | 2008-08-26 08:27:15 +0200 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-08-31 00:44:44 -0700 |
| commit | 5742bc42d061b7f60c6ed3dbd71c64f12c77f91f (patch) | |
| tree | d3ea18ff93f1ef27e01f9aa98ade6b242f4ad93e /src/audioOutputs | |
| parent | 25b5471f415db926e8b4ebe1a02e209d70757191 (diff) | |
| download | mpd-5742bc42d061b7f60c6ed3dbd71c64f12c77f91f.tar.gz mpd-5742bc42d061b7f60c6ed3dbd71c64f12c77f91f.tar.xz mpd-5742bc42d061b7f60c6ed3dbd71c64f12c77f91f.zip | |
jack: don't set audioOutput->data=NULL
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.
Diffstat (limited to 'src/audioOutputs')
| -rw-r--r-- | 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 9fc52055f..5e0b1b599 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) |