From bd18a383ef55605eeffd48a2f1123c973be9f612 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sat, 28 Dec 2024 16:08:29 +0100
Subject: [PATCH] music: use curly braces in GME magic detection
Backport from b1d71218d39cc4dae749867caefd31f20dd2ff88
(cherry picked from commit f49c898b5ea9c7c07ed5c54effc75afbc5ba5bd3)
---
src/music.c | 36 +++++++++++++-----------------------
1 file changed, 13 insertions(+), 23 deletions(-)
diff --git a/src/music.c b/src/music.c
index eda3a0d60..72e1477ce 100644
--- a/src/music.c
+++ b/src/music.c
@@ -606,30 +606,20 @@ Mix_MusicType detect_music_type(SDL_RWops *src)
}
/* GME Specific files */
- if (SDL_memcmp(magic, "ZXAY", 4) == 0)
- return MUS_GME;
- if (SDL_memcmp(magic, "GBS\x01", 4) == 0)
- return MUS_GME;
- if (SDL_memcmp(magic, "GYMX", 4) == 0)
- return MUS_GME;
- if (SDL_memcmp(magic, "HESM", 4) == 0)
- return MUS_GME;
- if (SDL_memcmp(magic, "KSCC", 4) == 0)
- return MUS_GME;
- if (SDL_memcmp(magic, "KSSX", 4) == 0)
- return MUS_GME;
- if (SDL_memcmp(magic, "NESM", 4) == 0)
- return MUS_GME;
- if (SDL_memcmp(magic, "NSFE", 4) == 0)
- return MUS_GME;
- if (SDL_memcmp(magic, "SAP\x0D", 4) == 0)
- return MUS_GME;
- if (SDL_memcmp(magic, "SNES", 4) == 0)
- return MUS_GME;
- if (SDL_memcmp(magic, "Vgm ", 4) == 0)
- return MUS_GME;
- if (SDL_memcmp(magic, "\x1f\x8b", 2) == 0)
+ if (SDL_memcmp(magic, "ZXAY", 4) == 0 ||
+ SDL_memcmp(magic, "GBS\x01", 4) == 0 ||
+ SDL_memcmp(magic, "GYMX", 4) == 0 ||
+ SDL_memcmp(magic, "HESM", 4) == 0 ||
+ SDL_memcmp(magic, "KSCC", 4) == 0 ||
+ SDL_memcmp(magic, "KSSX", 4) == 0 ||
+ SDL_memcmp(magic, "NESM", 4) == 0 ||
+ SDL_memcmp(magic, "NSFE", 4) == 0 ||
+ SDL_memcmp(magic, "SAP\x0D", 4) == 0 ||
+ SDL_memcmp(magic, "SNES", 4) == 0 ||
+ SDL_memcmp(magic, "Vgm ", 4) == 0 ||
+ SDL_memcmp(magic, "\x1f\x8b", 2) == 0) {
return MUS_GME;
+ }
/* Assume MOD format.
*