diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-02-07 10:12:25 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-02-07 10:12:25 +0000 |
| commit | 2e723e150ab9b11e658311d6dfe2a1c1e402b833 (patch) | |
| tree | 3dd87f0a3bcc014b30ba226b7efbdb1c143b08fe /ldso/ldso/dl-elf.c | |
| parent | cdf8ceb36ff80e68c0ffbde96b20cb088a9fe59b (diff) | |
Step one, begin shuffling things around a bit
Diffstat (limited to 'ldso/ldso/dl-elf.c')
| -rw-r--r-- | ldso/ldso/dl-elf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 6acf136c9..75c5972bf 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -166,7 +166,8 @@ search_for_named_library(const char *name, int secure, const char *path_list, } /* Check if the named library is already loaded... */ -struct elf_resolve *_dl_check_if_named_library_is_loaded(const char *full_libname) +struct elf_resolve *_dl_check_if_named_library_is_loaded(const char *full_libname, + int trace_loaded_objects) { const char *pnt, *pnt1; struct elf_resolve *tpnt1; @@ -201,7 +202,7 @@ struct elf_resolve *_dl_check_if_named_library_is_loaded(const char *full_libnam { /* Abort attempts to load glibc, libc5, etc */ if ( libname[8]!='0') { - if (!_dl_trace_loaded_objects) { + if (!trace_loaded_objects) { _dl_dprintf(2, aborted_wrong_lib, libname, _dl_progname); _dl_exit(1); } @@ -241,7 +242,7 @@ unsigned long _dl_internal_error_number; extern char *_dl_ldsopath; struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt, - struct elf_resolve *tpnt, char *full_libname) + struct elf_resolve *tpnt, char *full_libname, int trace_loaded_objects) { char *pnt, *pnt1; struct elf_resolve *tpnt1; @@ -265,7 +266,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt, /* Critical step! Weed out duplicates early to avoid * function aliasing, which wastes memory, and causes * really bad things to happen with weaks and globals. */ - if ((tpnt1=_dl_check_if_named_library_is_loaded(libname))!=NULL) + if ((tpnt1=_dl_check_if_named_library_is_loaded(libname, trace_loaded_objects))!=NULL) return tpnt1; #if defined (__SUPPORT_LD_DEBUG__) |