diff options
Diffstat (limited to 'src/malloc')
-rw-r--r-- | src/malloc/lite_malloc.c | 2 | ||||
-rw-r--r-- | src/malloc/malloc.c | 15 | ||||
-rw-r--r-- | src/malloc/memalign.c | 4 |
3 files changed, 6 insertions, 15 deletions
diff --git a/src/malloc/lite_malloc.c b/src/malloc/lite_malloc.c index 29cccb10..96c4feac 100644 --- a/src/malloc/lite_malloc.c +++ b/src/malloc/lite_malloc.c @@ -50,7 +50,7 @@ weak_alias(__simple_malloc, malloc); static void *__simple_calloc(size_t m, size_t n) { - if (n && m > (size_t)-1/n || malloc != __simple_malloc) { + if (n && m > (size_t)-1/n) { errno = ENOMEM; return 0; } diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c index 5a56e0c5..da775921 100644 --- a/src/malloc/malloc.c +++ b/src/malloc/malloc.c @@ -368,8 +368,6 @@ void *malloc(size_t n) return CHUNK_TO_MEM(c); } -weak_alias(malloc, __internal_malloc); - static size_t mal0_clear(char *p, size_t pagesz, size_t n) { #ifdef __GNUC__ @@ -396,13 +394,10 @@ void *calloc(size_t m, size_t n) } n *= m; void *p = malloc(n); - if (!p) return p; - if (malloc == __internal_malloc) { - if (IS_MMAPPED(MEM_TO_CHUNK(p))) - return p; - if (n >= PAGE_SIZE) - n = mal0_clear(p, PAGE_SIZE, n); - } + if (!p || IS_MMAPPED(MEM_TO_CHUNK(p))) + return p; + if (n >= PAGE_SIZE) + n = mal0_clear(p, PAGE_SIZE, n); return memset(p, 0, n); } @@ -568,8 +563,6 @@ void free(void *p) bin_chunk(self); } -weak_alias(free, __internal_free); - void __malloc_donate(char *start, char *end) { size_t align_start_up = (SIZE_ALIGN-1) & (-(uintptr_t)start - OVERHEAD); diff --git a/src/malloc/memalign.c b/src/malloc/memalign.c index 35b67599..8fb2002c 100644 --- a/src/malloc/memalign.c +++ b/src/malloc/memalign.c @@ -3,8 +3,6 @@ #include <errno.h> #include "libc.h" -void __internal_free(void *); - void *__memalign(size_t align, size_t len) { unsigned char *mem, *new, *end; @@ -15,7 +13,7 @@ void *__memalign(size_t align, size_t len) return NULL; } - if (len > SIZE_MAX - align || free != __internal_free) { + if (len > SIZE_MAX - align) { errno = ENOMEM; return NULL; } |