diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-09-05 03:42:43 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-09-05 03:42:43 +0000 |
| commit | 407fe3bbb3708abc6796acc71c5fe34371c2847c (patch) | |
| tree | 918b347c952d9d399789d21394b991bd42916977 /elf/dl-error.c | |
| parent | 71ce28fd1abbccc9814d199d770e673135a33ee1 (diff) | |
| download | glibc-407fe3bbb3708abc6796acc71c5fe34371c2847c.tar.gz glibc-407fe3bbb3708abc6796acc71c5fe34371c2847c.tar.xz glibc-407fe3bbb3708abc6796acc71c5fe34371c2847c.zip | |
Update.
2001-09-04 Ulrich Drepper <drepper@redhat.com> Correct very misleading message for error in failed runtime relocation. * elf/dl-error.c (_dl_signal_error): Take extra parameter to describe place of the error. (_dl_signal_cerror): Likewise. * sysdeps/generic/ldsodefs.h: Adjust prototypes. * elf/dl-close.c: Likewise. * elf/dl-deps.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-version.c: Likewise. * sysdeps/generic/dl-sysdep.c: Likewise.
Diffstat (limited to 'elf/dl-error.c')
| -rw-r--r-- | elf/dl-error.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/elf/dl-error.c b/elf/dl-error.c index bc328bc66c..be9a84361c 100644 --- a/elf/dl-error.c +++ b/elf/dl-error.c @@ -63,7 +63,8 @@ static receiver_fct receiver; void internal_function -_dl_signal_error (int errcode, const char *objname, const char *errstring) +_dl_signal_error (int errcode, const char *objname, const char *occation, + const char *errstring) { struct catch *lcatch; @@ -99,9 +100,9 @@ _dl_signal_error (int errcode, const char *objname, const char *errstring) { /* Lossage while resolving the program's own symbols is always fatal. */ char buffer[1024]; - _dl_fatal_printf ("\ -%s: error while loading shared libraries: %s%s%s%s%s\n", + _dl_fatal_printf ("%s: %s: %s%s%s%s%s\n", _dl_argv[0] ?: "<program name unknown>", + occation ?: N_("error while loading shared libraries"), objname, *objname ? ": " : "", errstring, errcode ? ": " : "", (errcode @@ -113,8 +114,7 @@ _dl_signal_error (int errcode, const char *objname, const char *errstring) void internal_function -_dl_signal_cerror (int errcode, - const char *objname, +_dl_signal_cerror (int errcode, const char *objname, const char *occation, const char *errstring) { if (receiver) @@ -125,7 +125,7 @@ _dl_signal_cerror (int errcode, (*receiver) (errcode, objname, errstring); } else - _dl_signal_error (errcode, objname, errstring); + _dl_signal_error (errcode, objname, occation, errstring); } |