From 5ceb889ac9a36e74e4e00c34c57cbb58d73e228c Mon Sep 17 00:00:00 2001 From: Weiwu Chen Date: Tue, 3 Dec 2013 19:47:34 +0800 Subject: [PATCH] bionic: Change the type of soinfo's size to size_t Some system functions like munmap expect soinfo's size to be size_t, but currently it is unsigned. Change it to size_t to fit 64bit's portability. Change-Id: I0bf6d522b38b0cd9bf1db05b004b5326217412a2 Signed-off-by: Weiwu Chen Signed-off-by: Qiming Shi --- linker/linker.cpp | 2 +- linker/linker.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linker/linker.cpp b/linker/linker.cpp index f58e22263..9bc9afe7f 100755 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -783,7 +783,7 @@ static soinfo* find_library_internal(const char* name) { // At this point we know that whatever is loaded @ base is a valid ELF // shared library whose segments are properly mapped in. - TRACE("[ init_library base=%p sz=0x%08x name='%s' ]", + TRACE("[ find_library_internal base=%p size=%zu name='%s' ]", reinterpret_cast(si->base), si->size, si->name); if (!soinfo_link_image(si)) { diff --git a/linker/linker.h b/linker/linker.h index 67a86abd4..972050f3f 100644 --- a/linker/linker.h +++ b/linker/linker.h @@ -106,7 +106,7 @@ struct soinfo { size_t phnum; Elf_Addr entry; Elf_Addr base; - unsigned size; + size_t size; #ifndef __LP64__ uint32_t unused1; // DO NOT USE, maintained for compatibility.