From: Andreas Schneider <asn@redhat.com>
Date: Fri, 19 Feb 2010 14:32:45 +0000 (+0100)
Subject: s3-lib: Remove obsolete signal type cast.
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=c6c21f489d1288326ee2511d173af2dd7430e62b

s3-lib: Remove obsolete signal type cast.
---

diff --git a/source3/lib/fault.c b/source3/lib/fault.c
index 50fa2b83700..de19a720bc4 100644
--- a/source3/lib/fault.c
+++ b/source3/lib/fault.c
@@ -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();
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 7aa36bac0b2..118f89169b9 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -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)
diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c
index 1d210a1e579..af0573e68e3 100644
--- a/source3/lib/util_tdb.c
+++ b/source3/lib/util_tdb.c
@@ -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)));