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.

audio: don't allow isCurrentAudioFormat(NULL)
9f16a34d · Max Kellermann · a53047af · 9f16a34d
Commit 9f16a34d authored Sep 10, 2008 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

audio.c src/audio.c +5 -3

No files found.
--- 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;