From 9f16a34d7638a4ea154c03d06a40984c114e17ee Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 10 Sep 2008 11:43:40 +0200 Subject: audio: don't allow isCurrentAudioFormat(NULL) Passing NULL to this function doesn't make sense, and complicates its implementation. The one caller which might pass NULL should rather check this. --- src/audio.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/audio.c b/src/audio.c index 9d92f2bd7..d4cd97a10 100644 --- a/src/audio.c +++ b/src/audio.c @@ -222,8 +222,9 @@ void finishAudioDriver(void) int isCurrentAudioFormat(const struct audio_format *audioFormat) { - return audioFormat == NULL || - audio_format_equals(audioFormat, &audio_format); + assert(audioFormat != NULL); + + return audio_format_equals(audioFormat, &audio_format); } static void syncAudioDeviceStates(void) @@ -292,7 +293,8 @@ int openAudioDevice(const struct audio_format *audioFormat) if (!audioOutputArray) return -1; - if (!audioOpened || !isCurrentAudioFormat(audioFormat)) { + if (!audioOpened || + (audioFormat != NULL && !isCurrentAudioFormat(audioFormat))) { flushAudioBuffer(); if (audioFormat != NULL) audio_format = *audioFormat; -- cgit v1.2.3