libreplace: Remove the obsolete signal type cast.

AC_SIGNAL_TYPE is already obsolete in autoconf. C89 requires signal
handlers to return void, only K&R returned int.

diff --git a/lib/replace/getpass.c b/lib/replace/getpass.c
index aab53c533de1aebd833af3f3b69310d1502cf827..f95109f2b43ddd0fc7b751ffde93aae3a8b4640c 100644 (file)
--- a/lib/replace/getpass.c
+++ b/lib/replace/getpass.c
@@ -34,10 +34,6 @@ typedef int sig_atomic_t;
 #define SIGCLD SIGCHLD
 #endif
 
-#ifndef SIGNAL_CAST
-#define SIGNAL_CAST (RETSIGTYPE (*)(int))
-#endif
-
 #ifdef SYSV_TERMIO 
 
 /* SYSTEM V TERMIO HANDLING */
@@ -99,7 +95,7 @@ static int tcsetattr(int fd, int flags, struct sgttyb *_t)
 static struct termios t;
 #endif /* SYSV_TERMIO */
 
-static void catch_signal(int signum,void (*handler)(int ))
+static void catch_signal(int signum, void (*handler)(int ))
 {
 #ifdef HAVE_SIGACTION
        struct sigaction act;
@@ -131,7 +127,7 @@ static int in_fd = -1;
  Signal function to tell us were ^C'ed.
 ****************************************************************/
 
-static void gotintr_sig(void)
+static void gotintr_sig(int signum)
 {
        gotintr = 1;
        if (in_fd != -1)
@@ -148,7 +144,7 @@ char *rep_getpass(const char *prompt)
        size_t nread;
 
        /* Catch problematic signals */
-       catch_signal(SIGINT, SIGNAL_CAST gotintr_sig);
+       catch_signal(SIGINT, gotintr_sig);
 
        /* Try to write to and read from the terminal if we can.
                If we can't open the terminal, use stderr and stdin.  */
@@ -211,7 +207,7 @@ char *rep_getpass(const char *prompt)
                fclose(in);
 
        /* Catch problematic signals */
-       catch_signal(SIGINT, SIGNAL_CAST SIG_DFL);
+       catch_signal(SIGINT, SIG_DFL);
 
        if (gotintr) {
                printf("Interrupted by signal.\n");

diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index d7873dbb67b407627d80d7ef2bde7958b76fc2e5..c8cd213b83da6a893f9462dca0ce7a53106613d6 100644 (file)
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -51,7 +51,6 @@ AC_SUBST(LIBREPLACEOBJ)
 
 LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
 
-AC_TYPE_SIGNAL
 AC_TYPE_UID_T
 AC_TYPE_MODE_T
 AC_TYPE_OFF_T

diff --git a/lib/replace/system/wait.h b/lib/replace/system/wait.h
index 79583ad2abcd17d48612ed8f628160c776b62597..41db1806a57f0f53296c08b18cb2c8d8d48cff92 100644 (file)
--- a/lib/replace/system/wait.h
+++ b/lib/replace/system/wait.h
@@ -36,10 +36,6 @@
 #define SIGCLD SIGCHLD
 #endif
 
-#ifndef SIGNAL_CAST
-#define SIGNAL_CAST (RETSIGTYPE (*)(int))
-#endif
-
 #ifdef HAVE_SETJMP_H
 #include <setjmp.h>
 #endif