diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-03-22 14:05:23 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-03-22 05:07:58 +0100 |
| commit | c8297073dbaf19237891fd97d9e62dc00ad4e1f0 (patch) | |
| tree | 14046c43f59dfcd69e789a8c871e665bc4ccb009 /source3/lib | |
| parent | 4928d66fc2f469b75090c34f8d233026485e4a1e (diff) | |
| download | samba-c8297073dbaf19237891fd97d9e62dc00ad4e1f0.tar.gz samba-c8297073dbaf19237891fd97d9e62dc00ad4e1f0.tar.bz2 samba-c8297073dbaf19237891fd97d9e62dc00ad4e1f0.zip | |
s3-fault: removed the cont_fn from fault_setup()
cont_fn() was supposed to be a way to continue after a seg fault. It
could never be called however, as smb_panic() from fault_report()
could never return, as dump_core() never returns at the end of
smb_panic()
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Tue Mar 22 05:07:58 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/fault.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/source3/lib/fault.c b/source3/lib/fault.c index dd87ae1100..8bb202086e 100644 --- a/source3/lib/fault.c +++ b/source3/lib/fault.c @@ -29,7 +29,6 @@ #include <sys/prctl.h> #endif -static void (*cont_fn)(void *); static char *corepath; /******************************************************************* @@ -51,19 +50,7 @@ static void fault_report(int sig) smb_panic("internal error"); - if (cont_fn) { - cont_fn(NULL); -#ifdef SIGSEGV - CatchSignal(SIGSEGV, SIG_DFL); -#endif -#ifdef SIGBUS - CatchSignal(SIGBUS, SIG_DFL); -#endif -#ifdef SIGABRT - CatchSignal(SIGABRT, SIG_DFL); -#endif - return; /* this should cause a core dump */ - } + /* smb_panic() never returns, so this is really redundent */ exit(1); } @@ -78,10 +65,8 @@ static void sig_fault(int sig) /******************************************************************* setup our fault handlers ********************************************************************/ -void fault_setup(void (*fn)(void *)) +void fault_setup(void) { - cont_fn = fn; - #ifdef SIGSEGV CatchSignal(SIGSEGV, sig_fault); #endif |