aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-error.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-05-31 13:23:14 +0000
committerRoland McGrath <roland@gnu.org>1995-05-31 13:23:14 +0000
commita1a9d215963c548aef245cacd8efa944de69503b (patch)
treeff96263310f3c2e3c1f90d4ec8b332b7af028d84 /elf/dl-error.c
parent4174072112e4e2b43cc65a5093a433b4270aed49 (diff)
downloadglibc-a1a9d215963c548aef245cacd8efa944de69503b.zip
glibc-a1a9d215963c548aef245cacd8efa944de69503b.tar.gz
glibc-a1a9d215963c548aef245cacd8efa944de69503b.tar.bz2
Tue May 30 15:52:32 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* mach/Makefile (server-interfaces): Removed notify and device_reply. For shlibs with eager binding, libmachuser.so must not refer to any functions not defined in libc.
Diffstat (limited to 'elf/dl-error.c')
-rw-r--r--elf/dl-error.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/elf/dl-error.c b/elf/dl-error.c
index acb21a0..b5af2e3 100644
--- a/elf/dl-error.c
+++ b/elf/dl-error.c
@@ -43,8 +43,14 @@ _dl_catch_error (const char **errstring,
signalled_errstring = signalled_objname = NULL;
errcode = setjmp (catch_env);
- (*operate) ();
+ if (errcode == 0)
+ {
+ (*operate) ();
+ return 0;
+ }
+
+ /* We get here only if we longjmp'd out of OPERATE. */
*errstring = signalled_errstring;
*objname = signalled_objname;
- return *errstring ? errcode : 0;
+ return errcode == -1 ? 0 : errcode;
}