diff options
Diffstat (limited to 'ldso/ldso/dl-elf.c')
| -rw-r--r-- | ldso/ldso/dl-elf.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 4e1de140e..2276d4a9f 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -54,7 +54,7 @@ int _dl_map_cache(void) if (_dl_stat(LDSO_CACHE, &st) || (fd = _dl_open(LDSO_CACHE, O_RDONLY)) < 0) { - _dl_fdprintf(2, "%s: can't open cache '%s'\n", _dl_progname, LDSO_CACHE); + _dl_fprintf(2, "%s: can't open cache '%s'\n", _dl_progname, LDSO_CACHE); _dl_cache_addr = (caddr_t) - 1; /* so we won't try again */ return -1; } @@ -63,7 +63,7 @@ int _dl_map_cache(void) _dl_cache_addr = (caddr_t) _dl_mmap(0, _dl_cache_size, PROT_READ, MAP_SHARED, fd, 0); _dl_close(fd); if (_dl_cache_addr == (caddr_t) - 1) { - _dl_fdprintf(2, "%s: can't map cache '%s'\n", + _dl_fprintf(2, "%s: can't map cache '%s'\n", _dl_progname, LDSO_CACHE); return -1; } @@ -77,7 +77,7 @@ int _dl_map_cache(void) (sizeof(header_t) + header->nlibs * sizeof(libentry_t)) || _dl_cache_addr[_dl_cache_size - 1] != '\0') { - _dl_fdprintf(2, "%s: cache '%s' is corrupt\n", _dl_progname, + _dl_fprintf(2, "%s: cache '%s' is corrupt\n", _dl_progname, LDSO_CACHE); goto fail; } @@ -90,7 +90,7 @@ int _dl_map_cache(void) if (libent[i].sooffset >= strtabsize || libent[i].liboffset >= strtabsize) { - _dl_fdprintf(2, "%s: cache '%s' is corrupt\n", _dl_progname, LDSO_CACHE); + _dl_fprintf(2, "%s: cache '%s' is corrupt\n", _dl_progname, LDSO_CACHE); goto fail; } } @@ -348,7 +348,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, * NO! When we open shared libraries we may search several paths. * it is inappropriate to generate an error here. */ - _dl_fdprintf(2, "%s: can't open '%s'\n", _dl_progname, libname); + _dl_fprintf(2, "%s: can't open '%s'\n", _dl_progname, libname); #endif _dl_internal_error_number = DL_ERROR_NOFILE; return NULL; @@ -361,7 +361,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, epnt->e_ident[2] != 'L' || epnt->e_ident[3] != 'F') { - _dl_fdprintf(2, "%s: '%s' is not an ELF file\n", _dl_progname, + _dl_fprintf(2, "%s: '%s' is not an ELF file\n", _dl_progname, libname); _dl_internal_error_number = DL_ERROR_NOTELF; _dl_close(infile); @@ -376,7 +376,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, { _dl_internal_error_number = (epnt->e_type != ET_DYN ? DL_ERROR_NOTDYN : DL_ERROR_NOTMAGIC); - _dl_fdprintf(2, "%s: '%s' is not an ELF executable for " ELF_TARGET + _dl_fprintf(2, "%s: '%s' is not an ELF executable for " ELF_TARGET "\n", _dl_progname, libname); _dl_close(infile); return NULL; @@ -389,7 +389,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, if (ppnt->p_type == PT_DYNAMIC) { if (dynamic_addr) - _dl_fdprintf(2, "%s: '%s' has more than one dynamic section\n", + _dl_fprintf(2, "%s: '%s' has more than one dynamic section\n", _dl_progname, libname); dynamic_addr = ppnt->p_vaddr; dynamic_size = ppnt->p_filesz; @@ -421,7 +421,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, status = (char *) _dl_mmap((char *) (piclib ? 0 : minvma), maxvma - minvma, PROT_NONE, flags | MAP_ANONYMOUS, -1, 0); if (_dl_mmap_check_error(status)) { - _dl_fdprintf(2, "%s: can't map '/dev/zero'\n", _dl_progname); + _dl_fprintf(2, "%s: can't map '/dev/zero'\n", _dl_progname); _dl_internal_error_number = DL_ERROR_MMAP_FAILED; _dl_close(infile); return NULL; @@ -453,7 +453,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, ppnt->p_offset & 0x7ffff000); if (_dl_mmap_check_error(status)) { - _dl_fdprintf(2, "%s: can't map '%s'\n", + _dl_fprintf(2, "%s: can't map '%s'\n", _dl_progname, libname); _dl_internal_error_number = DL_ERROR_MMAP_FAILED; _dl_munmap((char *) libaddr, maxvma - minvma); @@ -485,7 +485,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, ppnt->p_filesz, LXFLAGS(ppnt->p_flags), flags, infile, ppnt->p_offset & 0x7ffff000); if (_dl_mmap_check_error(status)) { - _dl_fdprintf(2, "%s: can't map '%s'\n", _dl_progname, libname); + _dl_fprintf(2, "%s: can't map '%s'\n", _dl_progname, libname); _dl_internal_error_number = DL_ERROR_MMAP_FAILED; _dl_munmap((char *) libaddr, maxvma - minvma); _dl_close(infile); @@ -515,7 +515,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, if (!dynamic_addr) { _dl_internal_error_number = DL_ERROR_NODYNAMIC; - _dl_fdprintf(2, "%s: '%s' is missing a dynamic section\n", + _dl_fprintf(2, "%s: '%s' is missing a dynamic section\n", _dl_progname, libname); return NULL; } |