From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 1 Feb 2012 17:01:00 +0000 (+0100)
Subject: kill dupplicated code between legacy interface and actual implementations
X-Git-Tag: exp_20120216~96
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0bf8d8ce536dfc289ece377a77c709502c3281ad

kill dupplicated code between legacy interface and actual implementations
---

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index 0de0dd2534..edff857ad7 100644
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -48,16 +48,12 @@ void *malloc(size_t n)
 
 void *calloc(size_t nmemb, size_t size)
 {
-  size_t total_size = nmemb * size;
   xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
 
   LOCK(mdp);
-  void *ret = mmalloc(mdp, total_size);
+  void *ret = mcalloc(mdp, nmemb,size);
   UNLOCK(mdp);
 
-  /* Fill the allocated memory with zeroes to mimic calloc behaviour */
-  memset(ret, '\0', total_size);
-
   return ret;
 }
 
@@ -67,14 +63,7 @@ void *realloc(void *p, size_t s)
   xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
 
   LOCK(mdp);
-  if (s) {
-    if (p)
-      ret = mrealloc(mdp, p, s);
-    else
-      ret = mmalloc(mdp, s);
-  } else {
-    mfree(mdp, p);
-  }
+  ret = mrealloc(mdp, p, s);
   UNLOCK(mdp);
 
   return ret;
diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c
index 9d20e03b48..3dd60c2418 100644
--- a/src/xbt/mmalloc/mrealloc.c
+++ b/src/xbt/mmalloc/mrealloc.c
@@ -28,9 +28,9 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size)
 
   if (size == 0) {
     mfree(mdp, ptr);
-    return (mmalloc(mdp, 0));
+    return mmalloc(mdp, 0);
   } else if (ptr == NULL) {
-    return (mmalloc(mdp, size));
+    return mmalloc(mdp, size);
   }