diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-05-28 00:23:58 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-05-28 00:23:58 +0000 |
| commit | 9ef201cda84a928ebdceeef18465b0d493c6648a (patch) | |
| tree | b9c39e76ebb65b9c4610a6a8b1c008674732b21e /libexec | |
| parent | a24daf26c4470371742d4259bff163505c314f93 (diff) | |
proto _dl_show_objects() in one place
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ld.so/dlfcn.c | 14 | ||||
| -rw-r--r-- | libexec/ld.so/loader.c | 3 | ||||
| -rw-r--r-- | libexec/ld.so/util.h | 3 |
3 files changed, 5 insertions, 15 deletions
diff --git a/libexec/ld.so/dlfcn.c b/libexec/ld.so/dlfcn.c index 1dee1bb4a0a..3ec5fd02e83 100644 --- a/libexec/ld.so/dlfcn.c +++ b/libexec/ld.so/dlfcn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dlfcn.c,v 1.16 2002/05/24 04:17:00 deraadt Exp $ */ +/* $OpenBSD: dlfcn.c,v 1.17 2002/05/28 00:23:57 deraadt Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -45,16 +45,13 @@ int _dl_errno; -void _dl_show_objects(void); - static int _dl_real_close(void *handle); static void _dl_unload_deps(elf_object_t *object); void * dlopen(const char *libname, int how) { - elf_object_t *object; - elf_object_t *dynobj; + elf_object_t *object, *dynobj; Elf_Dyn *dynp; if (libname == NULL) @@ -141,13 +138,6 @@ int dlctl(void *handle, int command, void *data) { switch (command) { - -#ifdef __mips__ - case DL_DUMP_MAP: - _dl_show_objects(); - return(0); -#endif /* __mips__ */ - default: _dl_errno = DL_INVALID_CTL; break; diff --git a/libexec/ld.so/loader.c b/libexec/ld.so/loader.c index be1229542b1..d1b4ef97ebb 100644 --- a/libexec/ld.so/loader.c +++ b/libexec/ld.so/loader.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loader.c,v 1.30 2002/05/24 04:17:00 deraadt Exp $ */ +/* $OpenBSD: loader.c,v 1.31 2002/05/28 00:23:57 deraadt Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -249,7 +249,6 @@ _dl_boot(const char **argv, const char **envp, const long loff, _dl_debug_state(); if (_dl_debug || _dl_traceld) { - void _dl_show_objects(); /* remove -Wall warning */ _dl_show_objects(); DL_DEB(("dynamic loading done.\n")); } diff --git a/libexec/ld.so/util.h b/libexec/ld.so/util.h index 73b022d8cbd..ec17a8a3877 100644 --- a/libexec/ld.so/util.h +++ b/libexec/ld.so/util.h @@ -1,4 +1,4 @@ -/* $OpenBSD: util.h,v 1.5 2002/05/27 20:07:06 deraadt Exp $ */ +/* $OpenBSD: util.h,v 1.6 2002/05/28 00:23:57 deraadt Exp $ */ /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> @@ -41,6 +41,7 @@ void *_dl_malloc(const int size); void _dl_free(void *); char *_dl_strdup(const char *); void _dl_printf(const char *fmt, ...); +void _dl_show_objects(void); /* * The following functions are declared inline so they can |