zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-03-03 07:51:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename p2 in load_pbag to zone_list

Browse source
This commit is contained in:
Marcus Weseloh 2021-03-14 20:55:52 +01:00
parent f694d41a0e
commit 0e761da102
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/sfloader/fluid_sffile.c
View file

@ -1146,7 +1146,8 @@ static int load_phdr(SFData *sf, unsigned int size)
/* preset bag loader */ /* preset bag loader */
static int load_pbag(SFData *sf, int size) static int load_pbag(SFData *sf, int size)
{ {
fluid_list_t *p, *p2; fluid_list_t *p;
fluid_list_t *zone_list;
SFZone *z, *pz = NULL; SFZone *z, *pz = NULL;
unsigned short genndx, modndx; unsigned short genndx, modndx;
unsigned short pgenndx = 0, pmodndx = 0; unsigned short pgenndx = 0, pmodndx = 0;
@ -1163,9 +1164,9 @@ static int load_pbag(SFData *sf, int size)
while(p) while(p)
{ {
/* traverse through presets */ /* traverse through presets */
p2 = ((SFPreset *)(p->data))->zone; zone_list = ((SFPreset *)(p->data))->zone;
while(p2) while(zone_list)
{ {
/* traverse preset's zones */ /* traverse preset's zones */
if((size -= SF_BAG_SIZE) < 0) if((size -= SF_BAG_SIZE) < 0)
@ -1180,7 +1181,7 @@ static int load_pbag(SFData *sf, int size)
return FALSE; return FALSE;
} }
p2->data = z; zone_list->data = z;
z->gen = NULL; /* Init gen and mod before possible failure, */ z->gen = NULL; /* Init gen and mod before possible failure, */
z->mod = NULL; /* to ensure proper cleanup (fluid_sffile_close) */ z->mod = NULL; /* to ensure proper cleanup (fluid_sffile_close) */
READW(sf, genndx); /* possible read failure ^ */ READW(sf, genndx); /* possible read failure ^ */
@ -1220,7 +1221,7 @@ static int load_pbag(SFData *sf, int size)
pz = z; /* update previous zone ptr */ pz = z; /* update previous zone ptr */
pgenndx = genndx; /* update previous zone gen index */ pgenndx = genndx; /* update previous zone gen index */
pmodndx = modndx; /* update previous zone mod index */ pmodndx = modndx; /* update previous zone mod index */
p2 = fluid_list_next(p2); zone_list = fluid_list_next(zone_list);
} }
p = fluid_list_next(p); p = fluid_list_next(p);