diff options
author | Christopher Ferris <cferris@google.com> | 2019-11-08 14:34:01 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-08 14:34:01 -0800 |
commit | 8eb1164902815457b2291cdb2135f23bd1acd7e1 (patch) | |
tree | fd7377abe04c92a37b3627999a9d352d6f6a3f93 /libc/malloc_hooks/malloc_hooks.cpp | |
parent | ad6b0985c21e40e25e450e36d1f9770dce2f1f0d (diff) | |
parent | 054e5d45c25d4db726b136196545fb8a59fada2f (diff) |
Merge "Rename iterate to malloc_iterate internally." am: c686ab54c2
am: 054e5d45c2
Change-Id: Ie70451e50648310bb0602a239d585f29ce21153f
Diffstat (limited to 'libc/malloc_hooks/malloc_hooks.cpp')
-rw-r--r-- | libc/malloc_hooks/malloc_hooks.cpp | 4 |
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; } |