INN commit: trunk (10 files)
INN Commit
Russ_Allbery at isc.org
Sun Apr 12 21:08:23 UTC 2009
Date: Sunday, April 12, 2009 @ 14:08:22
Author: iulius
Revision: 8418
AC_TYPE_SIGNAL is being obsoleted by Autoconf. On modern
systems, the returned signal type is void. So we just
use that type.
Modified:
trunk/backends/batcher.c
trunk/backends/buffchan.c
trunk/backends/innxbatch.c
trunk/backends/innxmit.c
trunk/configure.ac
trunk/expire/expireover.c
trunk/innd/cc.c
trunk/innd/innd.c
trunk/innd/proc.c
trunk/nnrpd/nnrpd.c
----------------------+
backends/batcher.c | 2 +-
backends/buffchan.c | 2 +-
backends/innxbatch.c | 6 +++---
backends/innxmit.c | 6 +++---
configure.ac | 1 -
expire/expireover.c | 2 +-
innd/cc.c | 4 ++--
innd/innd.c | 4 ++--
innd/proc.c | 2 +-
nnrpd/nnrpd.c | 6 +++---
10 files changed, 17 insertions(+), 18 deletions(-)
Modified: backends/batcher.c
===================================================================
--- backends/batcher.c 2009-04-12 20:52:52 UTC (rev 8417)
+++ backends/batcher.c 2009-04-12 21:08:22 UTC (rev 8418)
@@ -165,7 +165,7 @@
/*
** Mark that we got interrupted.
*/
-static RETSIGTYPE
+static void
CATCHinterrupt(int s)
{
GotInterrupt = true;
Modified: backends/buffchan.c
===================================================================
--- backends/buffchan.c 2009-04-12 20:52:52 UTC (rev 8417)
+++ backends/buffchan.c 2009-04-12 21:08:22 UTC (rev 8418)
@@ -317,7 +317,7 @@
/*
** Mark that we got a signal; let two signals kill us.
*/
-static RETSIGTYPE
+static void
CATCHinterrupt(int s)
{
GotInterrupt = true;
Modified: backends/innxbatch.c
===================================================================
--- backends/innxbatch.c 2009-04-12 20:52:52 UTC (rev 8417)
+++ backends/innxbatch.c 2009-04-12 21:08:22 UTC (rev 8418)
@@ -273,7 +273,7 @@
/*
** Mark that we got interrupted.
*/
-static RETSIGTYPE
+static void
CATCHinterrupt(int s)
{
GotInterrupt = true;
@@ -287,7 +287,7 @@
** Mark that the alarm went off.
*/
/* ARGSUSED0 */
-static RETSIGTYPE
+static void
CATCHalarm(int s UNUSED)
{
GotAlarm = true;
@@ -318,7 +318,7 @@
FILE *From;
FILE *To;
char buff[NNTP_STRLEN];
- RETSIGTYPE (*volatile old)(int) = NULL;
+ void (*volatile old)(int) = NULL;
struct stat statbuf;
int fd;
int err;
Modified: backends/innxmit.c
===================================================================
--- backends/innxmit.c 2009-04-12 20:52:52 UTC (rev 8417)
+++ backends/innxmit.c 2009-04-12 21:08:22 UTC (rev 8418)
@@ -694,7 +694,7 @@
/*
** Mark that we got interrupted.
*/
-static RETSIGTYPE
+static void
CATCHinterrupt(int s) {
GotInterrupt = true;
@@ -706,7 +706,7 @@
/*
** Mark that the alarm went off.
*/
-static RETSIGTYPE
+static void
CATCHalarm(int s UNUSED)
{
GotAlarm = true;
@@ -986,7 +986,7 @@
char buff[8192+128];
char *Article;
char *MessageID;
- RETSIGTYPE (*volatile old)(int) = NULL;
+ void (*volatile old)(int) = NULL;
volatile int port = NNTP_PORT;
bool val;
char *path;
Modified: configure.ac
===================================================================
--- configure.ac 2009-04-12 20:52:52 UTC (rev 8417)
+++ configure.ac 2009-04-12 21:08:22 UTC (rev 8418)
@@ -429,7 +429,6 @@
INN_TYPE_INT32_T
AC_TYPE_OFF_T
AC_TYPE_PID_T
-AC_TYPE_SIGNAL
AC_TYPE_SIZE_T
AC_TYPE_UID_T
AC_CHECK_TYPES([long long])
Modified: expire/expireover.c
===================================================================
--- expire/expireover.c 2009-04-12 20:52:52 UTC (rev 8417)
+++ expire/expireover.c 2009-04-12 21:08:22 UTC (rev 8418)
@@ -38,7 +38,7 @@
** behavior after receiving a signal so that repeating the signal will kill
** the program immediately.
*/
-static RETSIGTYPE
+static void
fatal_signal(int sig)
{
signalled = 1;
Modified: innd/cc.c
===================================================================
--- innd/cc.c 2009-04-12 20:52:52 UTC (rev 8417)
+++ innd/cc.c 2009-04-12 21:08:22 UTC (rev 8418)
@@ -126,7 +126,7 @@
{ SC_XEXEC, 1, CCxexec }
};
-static RETSIGTYPE CCresetup(int unused);
+static void CCresetup(int unused);
void
@@ -2034,7 +2034,7 @@
/*
** Restablish the control channel.
*/
-static RETSIGTYPE
+static void
CCresetup(int unused)
{
#ifndef HAVE_SIGACTION
Modified: innd/innd.c
===================================================================
--- innd/innd.c 2009-04-12 20:52:52 UTC (rev 8417)
+++ innd/innd.c 2009-04-12 21:08:22 UTC (rev 8418)
@@ -55,7 +55,7 @@
#endif
/* Internal prototypes. */
-static RETSIGTYPE catch_terminate(int sig);
+static void catch_terminate(int sig);
static void xmalloc_abort(const char *what, size_t size,
const char *file, int line);
@@ -213,7 +213,7 @@
** Signal handler to catch SIGTERM and similar signals and queue a clean
** shutdown.
*/
-static RETSIGTYPE
+static void
catch_terminate(int sig)
{
GotTerminate = true;
Modified: innd/proc.c
===================================================================
--- innd/proc.c 2009-04-12 20:52:52 UTC (rev 8417)
+++ innd/proc.c 2009-04-12 21:08:22 UTC (rev 8418)
@@ -50,7 +50,7 @@
/*
** Signal handler that collects the processes, then resets the signal.
*/
-static RETSIGTYPE
+static void
PROCcatchsignal(int s)
{
PROCreap();
Modified: nnrpd/nnrpd.c
===================================================================
--- nnrpd/nnrpd.c 2009-04-12 20:52:52 UTC (rev 8417)
+++ nnrpd/nnrpd.c 2009-04-12 21:08:22 UTC (rev 8418)
@@ -750,7 +750,7 @@
/*
** Got a signal; toggle tracing.
*/
-static RETSIGTYPE
+static void
ToggleTrace(int s NO_SIGACTION_UNUSED)
{
ChangeTrace = true;
@@ -762,7 +762,7 @@
/*
** Got a SIGPIPE; exit cleanly.
*/
-static RETSIGTYPE
+static void
CatchPipe(int s UNUSED)
{
ExitWithStats(0, false);
@@ -772,7 +772,7 @@
/*
** Got a signal; wait for children.
*/
-static RETSIGTYPE
+static void
WaitChild(int s NO_SIGACTION_UNUSED)
{
int pid;
More information about the inn-committers
mailing list