diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-06-10 04:01:36 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-06-10 04:01:36 +0000 |
| commit | 8e17ea58173d35e2e5dabfeb9fa5abf2609cfc51 (patch) | |
| tree | de81e2ebf2b5b32510d511caa07c2496e3d540ba /elf/dl-close.c | |
| parent | f3863621f617b040c66d635109203c29f35f7331 (diff) | |
| download | glibc-8e17ea58173d35e2e5dabfeb9fa5abf2609cfc51.zip glibc-8e17ea58173d35e2e5dabfeb9fa5abf2609cfc51.tar.gz glibc-8e17ea58173d35e2e5dabfeb9fa5abf2609cfc51.tar.bz2 | |
Update.
2000-06-09 Ulrich Drepper <drepper@redhat.com>
Rewrite error message handling.
* elf/dl-deps.c (_dl_map_object_deps): Pass new parameter to
_dl_catch_error.
* elf/dl-error (struct catch): Add objname member.
(_dl_signal_error): Take new parameter with object name. When
passing message on simply store object name and duplicate error
message.
(_dl_catch_error): Take new parameter. Store object name in the
place pointed to.
* include/dlfcn.h: Adjust _dl_catch_error prototype.
* sysdeps/generic/ldsodefs.h: Adjust _dl_signal_error prototype.
* elf/dl-libc.c (dlerror_run): Pass new parameter to _dl_catch_error.
* elf/dl-open.c (_dl_open): Likewise.
* elf/rtld.c (dl_main): Likewise.
* elf/dl-close.c: Mark error messages with N_().
* elf/dl-deps.c: Likewise.
* elf/dl-error.c: Likewise.
* elf/dl-load.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-reloc.c: Likewise.
* elf/dl-support.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/dl-lookup.c: Add comments about problems with error message
translations.
* elf/dl-reloc.c: Likewise.
* elf/dl-version.c: Likewise.
Diffstat (limited to 'elf/dl-close.c')
| -rw-r--r-- | elf/dl-close.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/elf/dl-close.c b/elf/dl-close.c index d6f0000..ec563ed 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -19,6 +19,7 @@ #include <assert.h> #include <dlfcn.h> +#include <libintl.h> #include <stdlib.h> #include <string.h> #include <bits/libc-lock.h> @@ -36,8 +37,6 @@ typedef void (*fini_t) (void); protect `dlopen' and `dlclose' in dlclose.c. */ __libc_lock_define (extern, _dl_load_lock) -#define LOSE(s) _dl_signal_error (0, map->l_name, s) - void internal_function _dl_close (void *_map) @@ -50,7 +49,7 @@ _dl_close (void *_map) unsigned int i; if (map->l_opencount == 0) - LOSE ("shared object not open"); + _dl_signal_error (0, map->l_name, N_("shared object not open")); /* Acquire the lock. */ __libc_lock_lock (_dl_load_lock); |