From 36282f9cae0dafa1f13aa54f704a4d37d92a0799 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Mon, 29 Feb 2016 16:39:14 -0500 Subject: [PATCH] Remove obsolete retsigtype Only relevent for pre-c89 K&R compilers. [mmeffie@sinenomine.net: avoid changes to src/external] Reviewed-on: https://gerrit.openafs.org/12203 Reviewed-by: Michael Meffie Reviewed-by: Andrew Deason Reviewed-by: Marcio Brito Barbosa Tested-by: BuildBot Reviewed-by: Benjamin Kaduk (cherry picked from commit a9644daa965fbf316943a07ad985b8ead2f4f31d) Change-Id: I37f83e7d8a59d5ccffe8542f3c4090e667b48c16 Reviewed-on: https://gerrit.openafs.org/13485 Reviewed-by: Michael Meffie Reviewed-by: Andrew Deason Reviewed-by: Marcio Brito Barbosa Reviewed-by: Cheyenne Wills Reviewed-by: Mark Vitale Tested-by: BuildBot Reviewed-by: Stephan Wiesand --- src/cf/retsigtype.m4 | 29 ----------------------------- src/cf/types.m4 | 13 ------------- src/config/afsconfig-windows.h | 4 ---- src/crypto/hcrypto/config.h | 3 +++ src/kopenafs/kopenafs.c | 4 ++-- src/tests/intr-read.c | 3 +-- src/tests/rename-under-feet.c | 4 +--- 7 files changed, 7 insertions(+), 53 deletions(-) delete mode 100644 src/cf/retsigtype.m4 diff --git a/src/cf/retsigtype.m4 b/src/cf/retsigtype.m4 deleted file mode 100644 index 72b7ec695..000000000 --- a/src/cf/retsigtype.m4 +++ /dev/null @@ -1,29 +0,0 @@ -dnl -dnl $Id$ -dnl -dnl Figure out return type of signal handlers, and define SIGRETURN macro -dnl that can be used to return from one -dnl -AC_DEFUN([OPENAFS_RETSIGTYPE],[ -AC_DIAGNOSE([obsolete],[your code may safely assume C89 semantics that RETSIGTYPE is void. -Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl -AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE( -[AC_LANG_PROGRAM([#include -#include -], - [return *(signal (0, 0)) (0) == 1;])], - [ac_cv_type_signal=int], - [ac_cv_type_signal=void])]) -AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers - (`int' or `void').]) - -if test "$ac_cv_type_signal" = "void" ; then - AC_DEFINE(VOID_RETSIGTYPE, 1, [Define if signal handlers return void.]) -fi - -AH_BOTTOM([#ifdef VOID_RETSIGTYPE -#define SIGRETURN(x) return -#else -#define SIGRETURN(x) return (RETSIGTYPE)(x) -#endif]) -]) diff --git a/src/cf/types.m4 b/src/cf/types.m4 index 50366134c..660bf8f38 100644 --- a/src/cf/types.m4 +++ b/src/cf/types.m4 @@ -4,19 +4,6 @@ LIBS="$save_LIBS" openafs_cv_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $XCFLAGS_NOCHECKING" -AC_DIAGNOSE([obsolete],[your code may safely assume C89 semantics that RETSIGTYPE is void. -Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl -AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE( -[AC_LANG_PROGRAM([#include -#include -], - [return *(signal (0, 0)) (0) == 1;])], - [ac_cv_type_signal=int], - [ac_cv_type_signal=void])]) -AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers - (`int' or `void').]) - -OPENAFS_RETSIGTYPE AC_CHECK_SIZEOF(void *) AC_CHECK_SIZEOF(unsigned long long) AC_CHECK_SIZEOF(unsigned long) diff --git a/src/config/afsconfig-windows.h b/src/config/afsconfig-windows.h index ca53a1832..9c2baa0d2 100644 --- a/src/config/afsconfig-windows.h +++ b/src/config/afsconfig-windows.h @@ -30,10 +30,6 @@ /* Define if you need to in order for stat and other things to work. */ #undef _POSIX_SOURCE -/* Define as the return type of signal handlers (int or void). */ -#undef RETSIGTYPE - - /* The size of `long', as computed by sizeof. */ #define SIZEOF_LONG 4 diff --git a/src/crypto/hcrypto/config.h b/src/crypto/hcrypto/config.h index 233cd090e..ce5637e55 100644 --- a/src/crypto/hcrypto/config.h +++ b/src/crypto/hcrypto/config.h @@ -50,4 +50,7 @@ #define ENGINE_up_ref _oafs_h_ENGINE_up_ref #define ENGINE_finish _oafs_h_ENGINE_finish +#define RETSIGTYPE void +#define SIGRETURN(x) return + #endif /* OAFS_HCRYPTO_CONFIG_H */ diff --git a/src/kopenafs/kopenafs.c b/src/kopenafs/kopenafs.c index 279c264f9..0a59cc8b4 100644 --- a/src/kopenafs/kopenafs.c +++ b/src/kopenafs/kopenafs.c @@ -30,7 +30,7 @@ static volatile sig_atomic_t syscall_okay = 1; /* Signal handler to catch failed system calls and change the okay flag. */ #ifdef SIGSYS -static RETSIGTYPE +static void sigsys_handler(int s) { syscall_okay = 0; @@ -43,7 +43,7 @@ k_hasafs(void) { struct ViceIoctl iob; int okay, saved_errno; - RETSIGTYPE (*saved_func)(int); + void (*saved_func)(int); saved_errno = errno; diff --git a/src/tests/intr-read.c b/src/tests/intr-read.c index 344c2abfd..99a08f6eb 100644 --- a/src/tests/intr-read.c +++ b/src/tests/intr-read.c @@ -50,7 +50,6 @@ #include -#define RETSIGTYPE void #ifndef MAXPATHLEN #ifdef PATH_MAX #define MAXPATHLEN PATH_MAX @@ -61,7 +60,7 @@ static sig_atomic_t set_alarm = 1; -static RETSIGTYPE +static void sigalrm(int foo) { signal(SIGALRM, sigalrm); diff --git a/src/tests/rename-under-feet.c b/src/tests/rename-under-feet.c index ad12e6cf6..8604b2cb9 100644 --- a/src/tests/rename-under-feet.c +++ b/src/tests/rename-under-feet.c @@ -49,8 +49,6 @@ #include -#define RETSIGTYPE void - static void emkdir(const char *path, mode_t mode) { @@ -63,7 +61,7 @@ static pid_t child_pid; static sig_atomic_t term_sig = 0; -static RETSIGTYPE +static void child_sigterm(int signo) { term_sig = 1; -- 2.39.5