diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-09-29 11:56:03 +0000 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-09-29 11:56:03 +0000 |
| commit | dc74a0fafc01720ffe3376df4e97d6c9b81fd04d (patch) | |
| tree | db01bf8fe7c09cf37c15f267f4557ee1fa972e6d /ldso | |
| parent | 0e4d33b939d8ca3b5408b3ed5fe0df9306d16698 (diff) | |
ldso: do not use hard-coded fd in _dl_dprintf. Use dl_debug_file consinstently.
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'ldso')
| -rw-r--r-- | ldso/ldso/ldso.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index df7477c72..263d93f44 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -462,7 +462,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, else #endif { - _dl_dprintf(2, "%s: can't load " "library '%s'\n", _dl_progname, str); + _dl_dprintf(_dl_debug_file, "%s: can't load " "library '%s'\n", _dl_progname, str); _dl_exit(15); } } else { @@ -505,7 +505,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, } if ((fd = _dl_open(LDSO_PRELOAD, O_RDONLY, 0)) < 0) { - _dl_dprintf(2, "%s: can't open file '%s'\n", + _dl_dprintf(_dl_debug_file, "%s: can't open file '%s'\n", _dl_progname, LDSO_PRELOAD); break; } @@ -514,7 +514,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); _dl_close(fd); if (preload == (caddr_t) -1) { - _dl_dprintf(2, "%s:%i: can't map '%s'\n", + _dl_dprintf(_dl_debug_file, "%s:%i: can't map '%s'\n", _dl_progname, __LINE__, LDSO_PRELOAD); break; } @@ -553,7 +553,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, else #endif { - _dl_dprintf(2, "%s: can't load library '%s'\n", _dl_progname, cp2); + _dl_dprintf(_dl_debug_file, "%s: can't load library '%s'\n", _dl_progname, cp2); _dl_exit(15); } } else { @@ -606,7 +606,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, } else #endif { - _dl_dprintf(2, "%s: can't load library '%s'\n", _dl_progname, lpntstr); + _dl_dprintf(_dl_debug_file, "%s: can't load library '%s'\n", _dl_progname, lpntstr); _dl_exit(16); } } @@ -922,7 +922,7 @@ void *_dl_malloc(size_t size) _dl_mmap_zero = _dl_malloc_addr = _dl_mmap((void *) 0, rounded_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (_dl_mmap_check_error(_dl_mmap_zero)) { - _dl_dprintf(2, "%s: mmap of a spare page failed!\n", _dl_progname); + _dl_dprintf(_dl_debug_file, "%s: mmap of a spare page failed!\n", _dl_progname); _dl_exit(20); } } |