sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

libreplace: Remove the obsolete signal type cast.

Browse Source 
AC_SIGNAL_TYPE is already obsolete in autoconf. C89 requires signal
handlers to return void, only K&R returned int.
This commit is contained in:
Andreas Schneider 2010-02-19 11:27:56 +01:00 committed by Stefan Metzmacher
parent 8ac0c9fc67
commit 13e2f5f971
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/replace/getpass.c
View File

@ -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");

1
lib/replace/libreplace.m4
View File

@ -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

4
lib/replace/system/wait.h
View File

@ -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