Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: use realloc for entry-array-resizing

Browse Source
This commit is contained in:
Campbell Barton
2015-03-13 01:54:38 +11:00
parent 1ce256cb8f
commit f2d4f6b086
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenloader/intern/readfile.c
View File

@@ -291,15 +291,9 @@ static void oldnewmap_insert(OldNewMap *onm, void *oldaddr, void *newaddr, int n
if (oldaddr==NULL || newaddr==NULL) return; if (oldaddr==NULL || newaddr==NULL) return;
if (onm->nentries == onm->entriessize) { if (UNLIKELY(onm->nentries == onm->entriessize)) {
int osize = onm->entriessize;
OldNew *oentries = onm->entries;
onm->entriessize *= 2; onm->entriessize *= 2;
onm->entries = MEM_mallocN(sizeof(*onm->entries)*onm->entriessize, "OldNewMap.entries"); onm->entries = MEM_reallocN(onm->entries, sizeof(*onm->entries) * onm->entriessize);
memcpy(onm->entries, oentries, sizeof(*oentries)*osize);
MEM_freeN(oentries);
} }
entry = &onm->entries[onm->nentries++]; entry = &onm->entries[onm->nentries++];