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-version.c | |
| parent | f3863621f617b040c66d635109203c29f35f7331 (diff) | |
| download | glibc-8e17ea58173d35e2e5dabfeb9fa5abf2609cfc51.tar glibc-8e17ea58173d35e2e5dabfeb9fa5abf2609cfc51.tar.gz glibc-8e17ea58173d35e2e5dabfeb9fa5abf2609cfc51.tar.bz2 glibc-8e17ea58173d35e2e5dabfeb9fa5abf2609cfc51.zip | |
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-version.c')
| -rw-r--r-- | elf/dl-version.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/elf/dl-version.c b/elf/dl-version.c index 67104916d6..504287c209 100644 --- a/elf/dl-version.c +++ b/elf/dl-version.c @@ -20,6 +20,7 @@ #include <elf.h> #include <errno.h> +#include <libintl.h> #include <stdlib.h> #include <string.h> #include <ldsodefs.h> @@ -93,6 +94,7 @@ match_symbol (const char *name, ElfW(Word) hash, const char *string, object was linked against another version of this file. We only print a message if verbose output is requested. */ if (verbose) + /* XXX We cannot translate the messages. */ _dl_signal_cerror (0, map->l_name, make_string ("\ no version information available (required by ", @@ -112,6 +114,7 @@ no version information available (required by ", { char buf[20]; buf[sizeof (buf) - 1] = '\0'; + /* XXX We cannot translate the message. */ _dl_signal_error (0, map->l_name, make_string ("unsupported version ", _itoa_word (def->vd_version, @@ -145,6 +148,7 @@ no version information available (required by ", if (__builtin_expect (weak, 1)) { if (verbose) + /* XXX We cannot translate the message. */ _dl_signal_cerror (0, map->l_name, make_string ("weak version `", string, "' not found (required by ", name, @@ -152,6 +156,7 @@ no version information available (required by ", return 0; } + /* XXX We cannot translate the message. */ _dl_signal_cerror (0, map->l_name, make_string ("version `", string, "' not found (required by ", name, ")")); @@ -192,6 +197,7 @@ _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode) { char buf[20]; buf[sizeof (buf) - 1] = '\0'; + /* XXX We cannot translate the message. */ _dl_signal_error (0, (*map->l_name ? map->l_name : _dl_argv[0]), make_string ("unsupported version ", _itoa_word (ent->vn_version, @@ -282,7 +288,7 @@ _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode) if (__builtin_expect (map->l_versions == NULL, 0)) { _dl_signal_error (ENOMEM, (*map->l_name ? map->l_name : _dl_argv[0]), - "cannot allocate version reference table"); + N_("cannot allocate version reference table")); result = 1; } else |