diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-02-22 18:05:04 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-02-22 18:05:04 +0000 |
| commit | 3f933dc2ef1aa201cd277a480b3954afa1f62b07 (patch) | |
| tree | 834ea1edc2342589cf5f5e3bca59fa1f7028ed2a /elf/dl-error.c | |
| parent | 69b3b3cb3873d59edfebae0cb7db58166d78f3a6 (diff) | |
Update.
1999-02-23 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* elf/dl-error.c (_dl_signal_cerror): New function.
(_dl_signal_error): Don't call receiver function.
* elf/dl-lookup.c (_dl_lookup_symbol): Call _dl_signal_cerror
instead of _dl_signal_error when reporting references to undefined
symbols or versions.
(_dl_lookup_versioned_symbol): Likewise.
(_dl_lookup_versioned_symbol_skip): Likewise.
* elf/dl-version.c (match_symbol): Likewise.
* elf/ldsodefs.h: Declare _dl_signal_cerror.
* misc/getttyent.c (getttyent): Release lock on stream later to
also protect global variable zapchar.
Diffstat (limited to 'elf/dl-error.c')
| -rw-r--r-- | elf/dl-error.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/elf/dl-error.c b/elf/dl-error.c index 9ccc193a66..e802c27763 100644 --- a/elf/dl-error.c +++ b/elf/dl-error.c @@ -43,7 +43,7 @@ __libc_tsd_define (static, DL_ERROR) #define tsd_setspecific(data) __libc_tsd_set (DL_ERROR, (data)) -/* This points to a function which is called when an error is +/* This points to a function which is called when an continuable error is received. Unlike the handling of `catch' this function may return. The arguments will be the `errstring' and `objname'. @@ -84,13 +84,6 @@ _dl_signal_error (int errcode, } longjmp (lcatch->env, errcode ?: -1); } - else if (receiver) - { - /* We are inside _dl_receive_error. Call the user supplied - handler and resume the work. The receiver will still be - installed. */ - (*receiver) (errcode, objname, errstring); - } else { /* Lossage while resolving the program's own symbols is always fatal. */ @@ -105,6 +98,25 @@ _dl_signal_error (int errcode, } } + +void +internal_function +_dl_signal_cerror (int errcode, + const char *objname, + const char *errstring) +{ + if (receiver) + { + /* We are inside _dl_receive_error. Call the user supplied + handler and resume the work. The receiver will still be + installed. */ + (*receiver) (errcode, objname, errstring); + } + else + _dl_signal_error (errcode, objname, errstring); +} + + int internal_function _dl_catch_error (char **errstring, |