diff --git a/arch/xtensa/src/esp32/esp32_wifi_adapter.c b/arch/xtensa/src/esp32/esp32_wifi_adapter.c index 2348d2a8cec..56832837e01 100644 --- a/arch/xtensa/src/esp32/esp32_wifi_adapter.c +++ b/arch/xtensa/src/esp32/esp32_wifi_adapter.c @@ -3645,7 +3645,7 @@ static void *esp_realloc_internal(void *ptr, size_t size) return NULL; } - old_size = malloc_usable_size(old_ptr); + old_size = malloc_size(old_ptr); DEBUGASSERT(old_size > 0); memcpy(new_ptr, old_ptr, MIN(old_size, size)); kmm_free(old_ptr); diff --git a/include/malloc.h b/include/malloc.h index a4bc6c4f43c..ddfa96f9dec 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -31,6 +31,8 @@ * Pre-processor Definitions ****************************************************************************/ +#define malloc_usable_size malloc_size + /**************************************************************************** * Public Type Definitions ****************************************************************************/ @@ -58,7 +60,7 @@ extern "C" #endif struct mallinfo mallinfo(void); -size_t malloc_usable_size(FAR void *ptr); +size_t malloc_size(FAR void *ptr); #if defined(__cplusplus) } diff --git a/mm/mm_heap/Make.defs b/mm/mm_heap/Make.defs index b44f98862f3..678c52c79eb 100644 --- a/mm/mm_heap/Make.defs +++ b/mm/mm_heap/Make.defs @@ -23,9 +23,9 @@ ifeq ($(CONFIG_MM_DEFAULT_MANAGER),y) CSRCS += mm_initialize.c mm_sem.c mm_addfreechunk.c mm_size2ndx.c -CSRCS += mm_malloc_usable_size.c mm_shrinkchunk.c -CSRCS += mm_brkaddr.c mm_calloc.c mm_extend.c mm_free.c mm_mallinfo.c -CSRCS += mm_malloc.c mm_memalign.c mm_realloc.c mm_zalloc.c mm_heapmember.c +CSRCS += mm_malloc_size.c mm_shrinkchunk.c mm_brkaddr.c mm_calloc.c +CSRCS += mm_extend.c mm_free.c mm_mallinfo.c mm_malloc.c +CSRCS += mm_memalign.c mm_realloc.c mm_zalloc.c mm_heapmember.c ifeq ($(CONFIG_BUILD_KERNEL),y) CSRCS += mm_sbrk.c diff --git a/mm/mm_heap/mm_malloc_usable_size.c b/mm/mm_heap/mm_malloc_size.c similarity index 95% rename from mm/mm_heap/mm_malloc_usable_size.c rename to mm/mm_heap/mm_malloc_size.c index b4df7173418..40bc7b2622a 100644 --- a/mm/mm_heap/mm_malloc_usable_size.c +++ b/mm/mm_heap/mm_malloc_size.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_heap/mm_malloc_usable_size.c + * mm/mm_heap/mm_malloc_size.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -36,7 +36,7 @@ * Public Functions ****************************************************************************/ -size_t malloc_usable_size(FAR void *mem) +size_t malloc_size(FAR void *mem) { FAR struct mm_freenode_s *node; diff --git a/mm/tlsf/mm_tlsf.c b/mm/tlsf/mm_tlsf.c index a451cde9941..774368130cd 100644 --- a/mm/tlsf/mm_tlsf.c +++ b/mm/tlsf/mm_tlsf.c @@ -855,10 +855,10 @@ int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info) } /**************************************************************************** - * Name: malloc_usable_size + * Name: malloc_size ****************************************************************************/ -size_t malloc_usable_size(FAR void *mem) +size_t malloc_size(FAR void *mem) { return tlsf_block_size(mem); }