diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-06 02:46:20 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-06 02:46:20 +0000 |
| commit | 1c7c8d902f3674f81f848057cab06264288cbfe7 (patch) | |
| tree | 9583322c80f94b80f1e8a62127be8d9af1ed33c9 /utils/ldd.c | |
| parent | 6e538396c7c8fa82f1134a7acf4b2b20078749f7 (diff) | |
| download | uClibc-alpine-1c7c8d902f3674f81f848057cab06264288cbfe7.tar.bz2 uClibc-alpine-1c7c8d902f3674f81f848057cab06264288cbfe7.tar.xz | |
Merge from trunk.
Diffstat (limited to 'utils/ldd.c')
| -rw-r--r-- | utils/ldd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/utils/ldd.c b/utils/ldd.c index dbd2f6de8..4545cf328 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -191,7 +191,7 @@ inline uint64_t byteswap64_to_host(uint64_t value) # define byteswap_to_host(x) byteswap64_to_host(x) #endif -ElfW(Shdr) * elf_find_section_type( int key, ElfW(Ehdr) *ehdr) +ElfW(Shdr) * elf_find_section_type( uint32_t key, ElfW(Ehdr) *ehdr) { int j; ElfW(Shdr) *shdr; @@ -204,7 +204,7 @@ ElfW(Shdr) * elf_find_section_type( int key, ElfW(Ehdr) *ehdr) return NULL; } -ElfW(Phdr) * elf_find_phdr_type( int type, ElfW(Ehdr) *ehdr) +ElfW(Phdr) * elf_find_phdr_type( uint32_t type, ElfW(Ehdr) *ehdr) { int j; ElfW(Phdr) *phdr = (ElfW(Phdr) *)(ehdr->e_phoff + (char *)ehdr); @@ -217,7 +217,7 @@ ElfW(Phdr) * elf_find_phdr_type( int type, ElfW(Ehdr) *ehdr) } /* Returns value if return_val==1, ptr otherwise */ -void * elf_find_dynamic(int const key, ElfW(Dyn) *dynp, +void * elf_find_dynamic( int64_t const key, ElfW(Dyn) *dynp, ElfW(Ehdr) *ehdr, int return_val) { ElfW(Phdr) *pt_text = elf_find_phdr_type(PT_LOAD, ehdr); @@ -648,6 +648,7 @@ static struct library * find_elf_interpreter(ElfW(Ehdr)* ehdr) } /* map the .so, and locate interesting pieces */ +#warning "There may be two warnings here about vfork() clobbering, ignore them" int find_dependancies(char* filename) { int is_suid = 0; |