Use 'void' instead of 'RETSIGTYPE'. Use 'sighandler_t' too.

C89 and POSIX.1-2001 define signal(2) as returning a pointer to a
function returning 'void'.  K&R C signal(2) signature is obsolete.
Use 'void' directly.

Also, instead of writing the function pointer type explicitly, use
POSIX's 'sighandler_t'.

Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>

diff --git a/configure.ac b/configure.ac
index 50ce7d85e35042d83a74f1609e6aba5d79dc0cf3..5f995654c5dbeb061f1e0e8b2e24d670bd643f82 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,6 @@ fi
 
 dnl Checks for library functions.
 AC_TYPE_GETGROUPS
-AC_TYPE_SIGNAL
 AC_FUNC_UTIME_NULL
 AC_REPLACE_FUNCS(mkdir putgrent putpwent putspent rename rmdir)
 AC_REPLACE_FUNCS(sgetgrent sgetpwent sgetspent)

diff --git a/libmisc/loginprompt.c b/libmisc/loginprompt.c
index 358564635318c58f79e1a1f96122c9eae5fa71ff..0a67f4637a1217419aa2655968058d998c57b16f 100644 (file)
--- a/libmisc/loginprompt.c
+++ b/libmisc/loginprompt.c
@@ -41,9 +41,9 @@ void login_prompt (const char *prompt, char *name, int namesize)
        int i;
        FILE *fp;
 
-       RETSIGTYPE (*sigquit) (int);
+       sighandler_t sigquit;
 #ifdef SIGTSTP
-       RETSIGTYPE (*sigtstp) (int);
+       sighandler_t sigtstp;
 #endif
 
        /*

diff --git a/src/expiry.c b/src/expiry.c
index 112c08c2cb5b14910d122cf35f2e955e02dc1d30..dc20b90e58328696665bed0db25e08d72d4a76bb 100644 (file)
--- a/src/expiry.c
+++ b/src/expiry.c
@@ -27,14 +27,14 @@ const char *Prog;
 static bool cflg = false;
 
 /* local function prototypes */
-static RETSIGTYPE catch_signals (unused int sig);
+static void catch_signals (unused int sig);
 static /*@noreturn@*/void usage (int status);
 static void process_flags (int argc, char **argv);
 
 /*
  * catch_signals - signal catcher
  */
-static RETSIGTYPE catch_signals (unused int sig)
+static void catch_signals (unused int sig)
 {
        _exit (10);
 }

diff --git a/src/gpasswd.c b/src/gpasswd.c
index c7c9477d20730380f4d6991e93e1bad2bd568be6..85fb1d17a9d5a89098c2bb6f8e16d001bf27c8f4 100644 (file)
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -74,7 +74,7 @@ static uid_t bywho;
 
 /* local function prototypes */
 static void usage (int status);
-static RETSIGTYPE catch_signals (int killed);
+static void catch_signals (int killed);
 static bool is_valid_user_list (const char *users);
 static void process_flags (int argc, char **argv);
 static void check_flags (int argc, int opt_index);
@@ -137,7 +137,7 @@ static void usage (int status)
  *     calls catch_signals() with a signal number, the terminal modes are
  *     then reset.
  */
-static RETSIGTYPE catch_signals (int killed)
+static void catch_signals (int killed)
 {
        static TERMIO sgtty;
 

diff --git a/src/login.c b/src/login.c
index bb85c758e9b07eee04c34ebf4e3f99e09f2977b4..d1198756e6f66ff9efb20ec56b3aa29b4bb88591 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -124,7 +124,7 @@ static void get_pam_user (char **ptr_pam_user);
 #endif
 
 static void init_env (void);
-static RETSIGTYPE alarm_handler (int);
+static void alarm_handler (int);
 
 /*
  * usage - print login command usage and exit
@@ -397,7 +397,7 @@ static void init_env (void)
 }
 
 
-static RETSIGTYPE alarm_handler (unused int sig)
+static void alarm_handler (unused int sig)
 {
        write (STDERR_FILENO, tmsg, strlen (tmsg));
        _exit (0);

diff --git a/src/su.c b/src/su.c
index 792e57a0d3be0f8386c21044fea171c64fc7bbaf..6cd82fca949eefb908a948ed2ee6b06d176baebf 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -104,10 +104,10 @@ static void execve_shell (const char *shellname,
                           char *args[],
                           char *const envp[]);
 #ifdef USE_PAM
-static RETSIGTYPE kill_child (int unused(s));
+static void kill_child (int unused(s));
 static void prepare_pam_close_session (void);
 #else                          /* !USE_PAM */
-static RETSIGTYPE die (int);
+static void die (int);
 static bool iswheel (const char *);
 #endif                         /* !USE_PAM */
 static bool restricted_shell (const char *shellname);
@@ -130,7 +130,7 @@ static void set_environment (struct passwd *pw);
  *     with die() as the signal handler. If signal later calls die() with a
  *     signal number, the terminal modes are then reset.
  */
-static RETSIGTYPE die (int killed)
+static void die (int killed)
 {
        static TERMIO sgtty;
 
@@ -157,7 +157,7 @@ static bool iswheel (const char *username)
        return is_on_list (grp->gr_mem, username);
 }
 #else                          /* USE_PAM */
-static RETSIGTYPE kill_child (int unused(s))
+static void kill_child (int unused(s))
 {
        if (0 != pid_child) {
                (void) kill (-pid_child, SIGKILL);
@@ -494,7 +494,7 @@ static void check_perms_nopam (const struct passwd *pw)
 {
        /*@observer@*/const struct spwd *spwd = NULL;
        /*@observer@*/const char *password = pw->pw_passwd;
-       RETSIGTYPE (*oldsig) (int);
+       sighandler_t oldsig;
 
        if (caller_is_root) {
                return;

diff --git a/src/sulogin.c b/src/sulogin.c
index 4d38daf6f609e46ed2b6b3bfa8f1e269154e4225..08feade2f31b22db286b094757a4df512bdfb607 100644 (file)
--- a/src/sulogin.c
+++ b/src/sulogin.c
@@ -44,9 +44,9 @@ extern char **environ;
 #endif
 
 /* local function prototypes */
-static RETSIGTYPE catch_signals (int);
+static void catch_signals (int);
 
-static RETSIGTYPE catch_signals (unused int sig)
+static void catch_signals (unused int sig)
 {
        _exit (1);
 }