mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
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.
This commit is contained in:
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user