generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 0aa84269: am 7055c72a: am 4ea434e5: Merge "bionic: Change the type of soinfo\'s size to size_t"

Browse Source 
* commit '0aa84269447141a032c0f3ad7830e9a2aa069809':
  bionic: Change the type of soinfo's size to size_t
This commit is contained in:
Elliott Hughes 2014-01-28 21:19:33 +00:00 committed by Android Git Automerger
commit 4d1bb942c2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linker/linker.cpp
View File

@ -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 // At this point we know that whatever is loaded @ base is a valid ELF
// shared library whose segments are properly mapped in. // 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<void*>(si->base), si->size, si->name); reinterpret_cast<void*>(si->base), si->size, si->name);
if (!soinfo_link_image(si)) { if (!soinfo_link_image(si)) {

2
linker/linker.h
View File

@ -106,7 +106,7 @@ struct soinfo {
size_t phnum; size_t phnum;
Elf_Addr entry; Elf_Addr entry;
Elf_Addr base; Elf_Addr base;
unsigned size; size_t size;
#ifndef __LP64__ #ifndef __LP64__
uint32_t unused1; // DO NOT USE, maintained for compatibility. uint32_t unused1; // DO NOT USE, maintained for compatibility.