[Bf-blender-cvs] [f2d4f6b] master: Cleanup: use realloc for entry-array-resizing

[Campbell Barton]

Commit: f2d4f6b086506c491b0f2efbacfcd0ef8c9b72ce
Author: Campbell Barton
Date:   Fri Mar 13 01:54:38 2015 +1100
Branches: master
https://developer.blender.org/rBf2d4f6b086506c491b0f2efbacfcd0ef8c9b72ce

Cleanup: use realloc for entry-array-resizing

===================================================================

M	source/blender/blenloader/intern/readfile.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index f62cba5..36a8309 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++];