From 580b6e09febc967b5039ef5d148be883089d0eff Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Thu, 12 Jun 2014 18:20:44 -0700 Subject: [PATCH] Fix %u format that should have been %zu. Change-Id: Icedacf6783d6b0cf4783c838b3c4622d2e67f073 --- libc/bionic/malloc_debug_qemu.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libc/bionic/malloc_debug_qemu.cpp b/libc/bionic/malloc_debug_qemu.cpp index 427248268..9b3bb5578 100644 --- a/libc/bionic/malloc_debug_qemu.cpp +++ b/libc/bionic/malloc_debug_qemu.cpp @@ -693,7 +693,7 @@ extern "C" void* qemu_instrumented_malloc(size_t bytes) { } desc.ptr = Malloc(malloc)(size); if (desc.ptr == NULL) { - qemu_error_log(" malloc(%zu): malloc(%u) failed.", + qemu_error_log(" malloc(%zu): malloc(%zu) failed.", malloc_pid, getpid(), bytes, size); return NULL; } @@ -898,14 +898,14 @@ extern "C" void* qemu_instrumented_realloc(void* mem, size_t bytes) { new_desc.suffix_size = DEFAULT_SUFFIX_SIZE; size_t new_size = mallocdesc_alloc_size(&new_desc); if (new_size < bytes) { // Overflow - qemu_error_log(": realloc(%p, %zu): malloc(%u) failed due to overflow", + qemu_error_log(": realloc(%p, %zu): malloc(%zu) failed due to overflow", malloc_pid, getpid(), mem, bytes, new_size); errno = ENOMEM; return NULL; } new_desc.ptr = Malloc(malloc)(new_size); if (new_desc.ptr == NULL) { - log_mdesc(error, &cur_desc, ": realloc(%p, %zu): malloc(%u) failed on ", + log_mdesc(error, &cur_desc, ": realloc(%p, %zu): malloc(%zu) failed on ", malloc_pid, getpid(), mem, bytes, new_size); return NULL; } @@ -978,14 +978,14 @@ extern "C" void* qemu_instrumented_memalign(size_t alignment, size_t bytes) { desc.suffix_size = DEFAULT_SUFFIX_SIZE; size_t size = mallocdesc_alloc_size(&desc); if (size < bytes) { // Overflow - qemu_error_log(" memalign(%zx, %zu): malloc(%u) failed due to overflow.", + qemu_error_log(" memalign(%zx, %zu): malloc(%zu) failed due to overflow.", malloc_pid, getpid(), alignment, bytes, size); return NULL; } desc.ptr = Malloc(memalign)(desc.prefix_size, size); if (desc.ptr == NULL) { - error_log(" memalign(%zx, %zu): malloc(%u) failed.", + error_log(" memalign(%zx, %zu): malloc(%zu) failed.", malloc_pid, getpid(), alignment, bytes, size); return NULL; }