From 8974af86d12f7e29b54b5090133ab3d7eea0e519 Mon Sep 17 00:00:00 2001 From: anupritaisno1 Date: Tue, 15 Sep 2020 01:33:53 +0000 Subject: [PATCH] hardened malloc: iterate -> malloc_iterate Signed-off-by: anupritaisno1 --- h_malloc.c | 2 +- include/h_malloc.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/h_malloc.c b/h_malloc.c index 901cb81..c7a9c85 100644 --- a/h_malloc.c +++ b/h_malloc.c @@ -1933,7 +1933,7 @@ EXPORT struct mallinfo h_mallinfo_bin_info(UNUSED size_t arena, UNUSED size_t bi return info; } -COLD EXPORT int h_iterate(UNUSED uintptr_t base, UNUSED size_t size, +COLD EXPORT int h_malloc_iterate(UNUSED uintptr_t base, UNUSED size_t size, UNUSED void (*callback)(uintptr_t ptr, size_t size, void *arg), UNUSED void *arg) { fatal_error("not implemented"); diff --git a/include/h_malloc.h b/include/h_malloc.h index 8b765b1..af2fa76 100644 --- a/include/h_malloc.h +++ b/include/h_malloc.h @@ -37,7 +37,7 @@ extern "C" { #define h_mallinfo_arena_info mallinfo_arena_info #define h_mallinfo_bin_info mallinfo_bin_info -#define h_iterate iterate +#define h_malloc_iterate malloc_iterate #define h_malloc_disable malloc_disable #define h_malloc_enable malloc_enable @@ -92,7 +92,7 @@ size_t h_mallinfo_narenas(void); size_t h_mallinfo_nbins(void); struct mallinfo h_mallinfo_arena_info(size_t arena); struct mallinfo h_mallinfo_bin_info(size_t arena, size_t bin); -int h_iterate(uintptr_t base, size_t size, void (*callback)(uintptr_t ptr, size_t size, void *arg), +int h_malloc_iterate(uintptr_t base, size_t size, void (*callback)(uintptr_t ptr, size_t size, void *arg), void *arg); void h_malloc_disable(void); void h_malloc_enable(void);