sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s3-lib: Remove obsolete signal type cast.

Browse Source
This commit is contained in:
Andreas Schneider 2010-02-19 15:32:45 +01:00 committed by Stefan Metzmacher
parent 5ad801beb9
commit c6c21f489d
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/lib/fault.c
View File

@ -54,13 +54,13 @@ static void fault_report(int sig)
if (cont_fn) {
cont_fn(NULL);
#ifdef SIGSEGV
CatchSignal(SIGSEGV,SIGNAL_CAST SIG_DFL);
CatchSignal(SIGSEGV, SIG_DFL);
#endif
#ifdef SIGBUS
CatchSignal(SIGBUS,SIGNAL_CAST SIG_DFL);
CatchSignal(SIGBUS, SIG_DFL);
#endif
#ifdef SIGABRT
CatchSignal(SIGABRT,SIGNAL_CAST SIG_DFL);
CatchSignal(SIGABRT, SIG_DFL);
#endif
return; /* this should cause a core dump */
}
@ -83,13 +83,13 @@ void fault_setup(void (*fn)(void *))
cont_fn = fn;
#ifdef SIGSEGV
CatchSignal(SIGSEGV,SIGNAL_CAST sig_fault);
CatchSignal(SIGSEGV, sig_fault);
#endif
#ifdef SIGBUS
CatchSignal(SIGBUS,SIGNAL_CAST sig_fault);
CatchSignal(SIGBUS, sig_fault);
#endif
#ifdef SIGABRT
CatchSignal(SIGABRT,SIGNAL_CAST sig_fault);
CatchSignal(SIGABRT, sig_fault);
#endif
}
@ -331,7 +331,7 @@ void dump_core_setup(const char *progname)
/* Ensure we don't have a signal handler for abort. */
#ifdef SIGABRT
CatchSignal(SIGABRT,SIGNAL_CAST SIG_DFL);
CatchSignal(SIGABRT, SIG_DFL);
#endif
abort();

4
source3/lib/smbldap.c
View File

@ -1399,7 +1399,7 @@ static int smbldap_search_ext(struct smbldap_state *ldap_state,
* just a bit more kind to the server. VL. */
got_alarm = 0;
CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
CatchSignal(SIGALRM, gotalarm_sig);
alarm(lp_ldap_timeout());
/* End setup timeout. */
@ -1434,7 +1434,7 @@ static int smbldap_search_ext(struct smbldap_state *ldap_state,
TALLOC_FREE(utf8_filter);
/* Teardown timeout. */
CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
CatchSignal(SIGALRM, SIG_IGN);
alarm(0);
if (got_alarm != 0)

6
source3/lib/util_tdb.c
View File

@ -34,7 +34,7 @@ static SIG_ATOMIC_T gotalarm;
Signal function to tell us we timed out.
****************************************************************/
static void gotalarm_sig(void)
static void gotalarm_sig(int signum)
{
gotalarm = 1;
}
@ -50,7 +50,7 @@ static int tdb_chainlock_with_timeout_internal( TDB_CONTEXT *tdb, TDB_DATA key,
gotalarm = 0;
if (timeout) {
CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
CatchSignal(SIGALRM, gotalarm_sig);
tdb_setalarm_sigptr(tdb, &gotalarm);
alarm(timeout);
}
@ -63,7 +63,7 @@ static int tdb_chainlock_with_timeout_internal( TDB_CONTEXT *tdb, TDB_DATA key,
if (timeout) {
alarm(0);
tdb_setalarm_sigptr(tdb, NULL);
CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
CatchSignal(SIGALRM, SIG_IGN);
if (gotalarm && (ret == -1)) {
DEBUG(0,("tdb_chainlock_with_timeout_internal: alarm (%u) timed out for key %s in tdb %s\n",
timeout, key.dptr, tdb_name(tdb)));