decoder/_ogg_common: simplify the large "if" expression

0d24250a · Max Kellermann · 2050e2f8 · 0d24250a
Commit 0d24250a authored Sep 04, 2012 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

_ogg_common.c src/decoder/_ogg_common.c +8 -6

No files found.
--- a/src/decoder/_ogg_common.c
+++ b/src/decoder/_ogg_common.c
@@ -33,12 +33,14 @@ ogg_stream_type ogg_stream_type_detect(struct input_stream *inStream)
 	size_t r;

 	r = decoder_read(NULL, inStream, buf, sizeof(buf));
-	if (r >= 32 && memcmp(buf, "OggS", 4) == 0 && (
-				(memcmp(buf+29, "FLAC", 4) == 0
-					&& memcmp(buf+37, "fLaC", 4) == 0)
-				|| (memcmp(buf+28, "FLAC", 4) == 0)
-				|| (memcmp(buf+28, "fLaC", 4) == 0))) {
+	if (r < 32 || memcmp(buf, "OggS", 4) != 0)
+		return VORBIS;
+
+	if ((memcmp(buf + 29, "FLAC", 4) == 0 &&
+	     memcmp(buf + 37, "fLaC", 4) == 0) ||
+	    memcmp(buf + 28, "FLAC", 4) == 0 ||
+	    memcmp(buf + 28, "fLaC", 4) == 0)
 		return FLAC;
-	}
+
 	return VORBIS;
 }