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

Rename p in load_ihdr to inst

Browse source
This commit is contained in:
Marcus Weseloh 2021-03-14 21:27:40 +01:00
parent 8df5abf903
commit c545766ea6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/sfloader/fluid_sffile.c
View file

@ -1592,7 +1592,7 @@ static int load_ihdr(SFData *sf, unsigned int size)
{ {
unsigned int i; unsigned int i;
int i2; int i2;
SFInst *p, *pr = NULL; /* ptr to current & previous instrument */ SFInst *inst, *pr = NULL; /* ptr to current & previous instrument */
unsigned short zndx, pzndx = 0; unsigned short zndx, pzndx = 0;
if(size % SF_IHDR_SIZE || size == 0) /* chunk size is valid? */ if(size % SF_IHDR_SIZE || size == 0) /* chunk size is valid? */
@ -1614,16 +1614,16 @@ static int load_ihdr(SFData *sf, unsigned int size)
for(i = 0; i < size; i++) for(i = 0; i < size; i++)
{ {
/* load all instrument headers */ /* load all instrument headers */
if((p = FLUID_NEW(SFInst)) == NULL) if((inst = FLUID_NEW(SFInst)) == NULL)
{ {
FLUID_LOG(FLUID_ERR, "Out of memory"); FLUID_LOG(FLUID_ERR, "Out of memory");
return FALSE; return FALSE;
} }
sf->inst = fluid_list_append(sf->inst, p); sf->inst = fluid_list_append(sf->inst, inst);
p->zone = NULL; /* For proper cleanup if fail (fluid_sffile_close) */ inst->zone = NULL; /* For proper cleanup if fail (fluid_sffile_close) */
p->idx = i; inst->idx = i;
READSTR(sf, &p->name); /* Possible read failure ^ */ READSTR(sf, &inst->name); /* Possible read failure ^ */
READW(sf, zndx); READW(sf, zndx);
if(pr) if(pr)
@ -1648,7 +1648,7 @@ static int load_ihdr(SFData *sf, unsigned int size)
} }
pzndx = zndx; pzndx = zndx;
pr = p; /* update instrument ptr */ pr = inst; /* update instrument ptr */
} }
FSKIP(sf, 20); FSKIP(sf, 20);