zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-05-31 09:11:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve chunk id search (#471)

Browse source 
If we move UNKN_ID to the bottom of the enum, in the for() cycle inside chunkid() if the value is not found then the "i" variable will be already UNKN_ID.
This commit is contained in:
carlo-bramini 2018-11-25 10:02:33 +01:00 • committed by Tom M
parent 36da011191
commit b8b41f781f
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/sfloader/fluid_sffile.c
View file

@ -43,7 +43,6 @@
/* sf file chunk IDs */ /* sf file chunk IDs */
enum enum
{ {
UNKN_ID,
RIFF_ID, RIFF_ID,
LIST_ID, LIST_ID,
SFBK_ID, SFBK_ID,
@ -74,7 +73,9 @@ enum
IMOD_ID, IMOD_ID,
IGEN_ID, /* instrument ids */ IGEN_ID, /* instrument ids */
SHDR_ID, /* sample info */ SHDR_ID, /* sample info */
SM24_ID SM24_ID,
UNKN_ID
}; };
/* /*
@ -517,11 +518,12 @@ static int chunkid(uint32_t id)
{ {
if(*p == id) if(*p == id)
{ {
return (i + 1); break;
} }
} }
return UNKN_ID; /* Return chunk id or UNKN_ID if not found */
return i;
} }
static int load_header(SFData *sf) static int load_header(SFData *sf)