diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-03-12 17:54:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-03-12 17:55:48 +0300 |
commit | f2d4f6b086506c491b0f2efbacfcd0ef8c9b72ce (patch) | |
tree | 03f0143047d38a85867f5c5da0419581a22ec579 /source/blender/blenloader | |
parent | 1ce256cb8f45acb0041b9f43c55db3194a1a5b1b (diff) |
Cleanup: use realloc for entry-array-resizing
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f62cba5c790..36a8309db4d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -291,15 +291,9 @@ static void oldnewmap_insert(OldNewMap *onm, void *oldaddr, void *newaddr, int n if (oldaddr==NULL || newaddr==NULL) return; - if (onm->nentries == onm->entriessize) { - int osize = onm->entriessize; - OldNew *oentries = onm->entries; - + if (UNLIKELY(onm->nentries == onm->entriessize)) { onm->entriessize *= 2; - onm->entries = MEM_mallocN(sizeof(*onm->entries)*onm->entriessize, "OldNewMap.entries"); - - memcpy(onm->entries, oentries, sizeof(*oentries)*osize); - MEM_freeN(oentries); + onm->entries = MEM_reallocN(onm->entries, sizeof(*onm->entries) * onm->entriessize); } entry = &onm->entries[onm->nentries++]; |