zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-12-13 22:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename p2 in load_ibag to zone_list

Browse source
This commit is contained in:
Marcus Weseloh 2021-03-14 20:58:55 +01:00
parent b5d80a1248
commit 355c50631d
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

@ -1672,7 +1672,8 @@ static int load_ihdr(SFData *sf, unsigned int size)
/* instrument bag loader */ /* instrument bag loader */
static int load_ibag(SFData *sf, int size) static int load_ibag(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, pgenndx = 0, pmodndx = 0; unsigned short genndx, modndx, pgenndx = 0, pmodndx = 0;
int i; int i;
@ -1688,9 +1689,9 @@ static int load_ibag(SFData *sf, int size)
while(p) while(p)
{ {
/* traverse through inst */ /* traverse through inst */
p2 = ((SFInst *)(p->data))->zone; zone_list = ((SFInst *)(p->data))->zone;
while(p2) while(zone_list)
{ {
/* load this inst's zones */ /* load this inst's zones */
if((size -= SF_BAG_SIZE) < 0) if((size -= SF_BAG_SIZE) < 0)
@ -1705,7 +1706,7 @@ static int load_ibag(SFData *sf, int size)
return FALSE; return FALSE;
} }
p2->data = z; zone_list->data = z;
z->gen = NULL; /* In case of failure, */ z->gen = NULL; /* In case of failure, */
z->mod = NULL; /* fluid_sffile_close can clean up */ z->mod = NULL; /* fluid_sffile_close can clean up */
READW(sf, genndx); /* READW = possible read failure */ READW(sf, genndx); /* READW = possible read failure */
@ -1745,7 +1746,7 @@ static int load_ibag(SFData *sf, int size)
pz = z; /* update previous zone ptr */ pz = z; /* update previous zone ptr */
pgenndx = genndx; pgenndx = genndx;
pmodndx = modndx; pmodndx = modndx;
p2 = fluid_list_next(p2); zone_list = fluid_list_next(zone_list);
} }
p = fluid_list_next(p); p = fluid_list_next(p);