X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b2b3260ead87e53cc1047eca74372d81a3269867..99c64fec9d54f28cfa4e27923d886020c1db26d3:/src/xbt/mmalloc/mm_legacy.c

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index 6b96776633..7523018d3a 100644
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
+/* Copyright (c) 2010-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -43,13 +43,6 @@ xbt_mheap_t mmalloc_get_current_heap(void)
   return __mmalloc_current_heap;
 }
 
-xbt_mheap_t mmalloc_set_current_heap(xbt_mheap_t new_heap)
-{
-  xbt_mheap_t heap = __mmalloc_current_heap;
-  __mmalloc_current_heap = new_heap;
-  return heap;
-}
-
 /* Override the malloc-like functions if MC is activated at compile time */
 #if SIMGRID_HAVE_MC
 
@@ -92,12 +85,12 @@ static void* mm_fake_calloc(size_t nmemb, size_t size)
   return mm_fake_malloc(n);
 }
 
-static void* mm_fake_realloc(void *p, size_t s)
+static void* mm_fake_realloc(XBT_ATTRIB_UNUSED void* p, size_t s)
 {
   return mm_fake_malloc(s);
 }
 
-static void mm_fake_free(void *p)
+static void mm_fake_free(XBT_ATTRIB_UNUSED void* p)
 {
   // Nothing to do
 }
@@ -119,7 +112,7 @@ static int mm_initialized;
 
 /** Constructor functions used to initialize the malloc implementation
  */
-static void __attribute__((constructor(101))) mm_legacy_constructor()
+XBT_ATTRIB_CONSTRUCTOR(101) static void mm_legacy_constructor()
 {
   if (mm_initialized)
     return;
@@ -155,28 +148,6 @@ static void __attribute__((constructor(101))) mm_legacy_constructor()
 
 #define GET_HEAP() __mmalloc_current_heap
 
-void* malloc_no_memset(size_t n)
-{
-  if (!mm_initialized) {
-    if (mm_initializing)
-      return mm_fake_malloc(n);
-    mm_legacy_constructor();
-  }
-
-  if (!__malloc_use_mmalloc) {
-    return mm_real_malloc(n);
-  }
-
-  xbt_mheap_t mdp = GET_HEAP();
-  if (!mdp)
-    return NULL;
-
-  LOCK(mdp);
-  void *ret = mmalloc_no_memset(mdp, n);
-  UNLOCK(mdp);
-  return ret;
-}
-
 void *malloc(size_t n)
 {
   if (!mm_initialized) {