summaryrefslogtreecommitdiff
path: root/libc/malloc_hooks/malloc_hooks.cpp
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2019-11-08 14:38:58 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-08 14:38:58 -0800
commit4ca59fc395e34a4b888a0e496f7d846a5a47ec42 (patch)
treefd7377abe04c92a37b3627999a9d352d6f6a3f93 /libc/malloc_hooks/malloc_hooks.cpp
parent43d091dd4d78422239263df110de7f55a911f6eb (diff)
parent8eb1164902815457b2291cdb2135f23bd1acd7e1 (diff)
Merge "Rename iterate to malloc_iterate internally." am: c686ab54c2 am: 054e5d45c2
am: 8eb1164902 Change-Id: I871e369f8e6a6dfdbd0c83855ead2ef56358ba70
Diffstat (limited to 'libc/malloc_hooks/malloc_hooks.cpp')
-rw-r--r--libc/malloc_hooks/malloc_hooks.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/malloc_hooks/malloc_hooks.cpp b/libc/malloc_hooks/malloc_hooks.cpp
index b1c1d5060..1ba869698 100644
--- a/libc/malloc_hooks/malloc_hooks.cpp
+++ b/libc/malloc_hooks/malloc_hooks.cpp
@@ -67,7 +67,7 @@ void* hooks_calloc(size_t nmemb, size_t bytes);
struct mallinfo hooks_mallinfo();
int hooks_mallopt(int param, int value);
int hooks_posix_memalign(void** memptr, size_t alignment, size_t size);
-int hooks_iterate(uintptr_t base, size_t size,
+int hooks_malloc_iterate(uintptr_t base, size_t size,
void (*callback)(uintptr_t base, size_t size, void* arg), void* arg);
void hooks_malloc_disable();
void hooks_malloc_enable();
@@ -209,7 +209,7 @@ int hooks_posix_memalign(void** memptr, size_t alignment, size_t size) {
return g_dispatch->posix_memalign(memptr, alignment, size);
}
-int hooks_iterate(uintptr_t, size_t, void (*)(uintptr_t, size_t, void*), void*) {
+int hooks_malloc_iterate(uintptr_t, size_t, void (*)(uintptr_t, size_t, void*), void*) {
return 0;
}