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

am bda5da07: fix prototype of dladdr

Browse Source 
* commit 'bda5da074eab4bdf374e1f4a19d480c62c72f5ff':
  fix prototype of dladdr
This commit is contained in:
Mathias Agopian 2011-09-28 15:18:12 -07:00 committed by Android Git Automerger
commit 451159035a
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/include/dlfcn.h
View File

@ -47,7 +47,7 @@ extern void* dlopen(const char* filename, int flag);
extern int dlclose(void* handle); extern int dlclose(void* handle);
extern const char* dlerror(void); extern const char* dlerror(void);
extern void* dlsym(void* handle, const char* symbol); extern void* dlsym(void* handle, const char* symbol);
extern int dladdr(void* addr, Dl_info *info); extern int dladdr(const void* addr, Dl_info *info);
enum { enum {
RTLD_NOW = 0, RTLD_NOW = 0,

2
libdl/libdl.c
View File

@ -21,7 +21,7 @@
void *dlopen(const char *filename, int flag) { return 0; } void *dlopen(const char *filename, int flag) { return 0; }
const char *dlerror(void) { return 0; } const char *dlerror(void) { return 0; }
void *dlsym(void *handle, const char *symbol) { return 0; } void *dlsym(void *handle, const char *symbol) { return 0; }
int dladdr(void *addr, Dl_info *info) { return 0; } int dladdr(const void *addr, Dl_info *info) { return 0; }
int dlclose(void *handle) { return 0; } int dlclose(void *handle) { return 0; }
#ifdef __arm__ #ifdef __arm__

2
linker/dlfcn.c
View File

@ -124,7 +124,7 @@ err:
return 0; return 0;
} }
int dladdr(void *addr, Dl_info *info) int dladdr(const void *addr, Dl_info *info)
{ {
int ret = 0; int ret = 0;

4
linker/linker.c
View File

@ -546,7 +546,7 @@ Elf32_Sym *lookup(const char *name, soinfo **found, soinfo *start)
return NULL; return NULL;
} }
soinfo *find_containing_library(void *addr) soinfo *find_containing_library(const void *addr)
{ {
soinfo *si; soinfo *si;
@ -560,7 +560,7 @@ soinfo *find_containing_library(void *addr)
return NULL; return NULL;
} }
Elf32_Sym *find_containing_symbol(void *addr, soinfo *si) Elf32_Sym *find_containing_symbol(const void *addr, soinfo *si)
{ {
unsigned int i; unsigned int i;
unsigned soaddr = (unsigned)addr - si->base; unsigned soaddr = (unsigned)addr - si->base;

4
linker/linker.h
View File

@ -213,8 +213,8 @@ soinfo *find_library(const char *name);
unsigned unload_library(soinfo *si); unsigned unload_library(soinfo *si);
Elf32_Sym *lookup_in_library(soinfo *si, const char *name); Elf32_Sym *lookup_in_library(soinfo *si, const char *name);
Elf32_Sym *lookup(const char *name, soinfo **found, soinfo *start); Elf32_Sym *lookup(const char *name, soinfo **found, soinfo *start);
soinfo *find_containing_library(void *addr); soinfo *find_containing_library(const void *addr);
Elf32_Sym *find_containing_symbol(void *addr, soinfo *si); Elf32_Sym *find_containing_symbol(const void *addr, soinfo *si);
const char *linker_get_error(void); const char *linker_get_error(void);
#ifdef ANDROID_ARM_LINKER #ifdef ANDROID_ARM_LINKER