summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRincewindsHat <12514511+RincewindsHat@users.noreply.github.com>2023-09-23 12:31:33 +0200
committerRincewindsHat <12514511+RincewindsHat@users.noreply.github.com>2023-09-23 12:31:33 +0200
commit513929d796af668e977ca7981800c259304a2f25 (patch)
tree644b0c1c57cb0aab049385789354017da05b17bd
parent719e27ddc2f0b48bcd7fe5584b23e3ce83ddf291 (diff)
downloadmonitoring-plugins-513929d.tar.gz
Remove check for RETSIGTYPE in autoconf stuff
autoupdate tells me, that since C89 I can safely assume RETSIGTYPE is void. Therefore to simplify things I removed the corresponding configure.ac line and replaced all mentions of RETSIGTYPE with void.
-rw-r--r--configure.ac1
-rw-r--r--lib/utils_cmd.h2
-rw-r--r--plugins/netutils.h2
-rw-r--r--plugins/popen.c8
-rw-r--r--plugins/popen.h2
5 files changed, 7 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index a294b00f..e6a40d3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -621,7 +621,6 @@ AC_C_CONST
621AC_STRUCT_TM 621AC_STRUCT_TM
622AC_TYPE_PID_T 622AC_TYPE_PID_T
623AC_TYPE_SIZE_T 623AC_TYPE_SIZE_T
624AC_TYPE_SIGNAL
625 624
626AC_CACHE_CHECK([for va_copy],ac_cv_HAVE_VA_COPY,[ 625AC_CACHE_CHECK([for va_copy],ac_cv_HAVE_VA_COPY,[
627AC_TRY_LINK([#include <stdarg.h> 626AC_TRY_LINK([#include <stdarg.h>
diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h
index 1fc2968c..f1b06c82 100644
--- a/lib/utils_cmd.h
+++ b/lib/utils_cmd.h
@@ -33,7 +33,7 @@ void cmd_init (void);
33#define CMD_NO_ASSOC 0x02 /* output.line won't point to buf */ 33#define CMD_NO_ASSOC 0x02 /* output.line won't point to buf */
34 34
35 35
36RETSIGTYPE timeout_alarm_handler (int); 36void timeout_alarm_handler (int);
37 37
38 38
39#endif /* _UTILS_CMD_ */ 39#endif /* _UTILS_CMD_ */
diff --git a/plugins/netutils.h b/plugins/netutils.h
index d7ee0ddd..ea653e72 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -92,7 +92,7 @@ extern int econn_refuse_state;
92extern int was_refused; 92extern int was_refused;
93extern int address_family; 93extern int address_family;
94 94
95RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn)); 95void socket_timeout_alarm_handler (int) __attribute__((noreturn));
96 96
97/* SSL-Related functionality */ 97/* SSL-Related functionality */
98#ifdef HAVE_SSL 98#ifdef HAVE_SSL
diff --git a/plugins/popen.c b/plugins/popen.c
index b395f14a..036bc608 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -50,9 +50,9 @@ extern FILE *child_process;
50FILE *spopen (const char *); 50FILE *spopen (const char *);
51int spclose (FILE *); 51int spclose (FILE *);
52#ifdef REDHAT_SPOPEN_ERROR 52#ifdef REDHAT_SPOPEN_ERROR
53RETSIGTYPE popen_sigchld_handler (int); 53void popen_sigchld_handler (int);
54#endif 54#endif
55RETSIGTYPE popen_timeout_alarm_handler (int); 55void popen_timeout_alarm_handler (int);
56 56
57#include <stdarg.h> /* ANSI C header file */ 57#include <stdarg.h> /* ANSI C header file */
58#include <fcntl.h> 58#include <fcntl.h>
@@ -266,7 +266,7 @@ spclose (FILE * fp)
266} 266}
267 267
268#ifdef REDHAT_SPOPEN_ERROR 268#ifdef REDHAT_SPOPEN_ERROR
269RETSIGTYPE 269void
270popen_sigchld_handler (int signo) 270popen_sigchld_handler (int signo)
271{ 271{
272 if (signo == SIGCHLD) 272 if (signo == SIGCHLD)
@@ -274,7 +274,7 @@ popen_sigchld_handler (int signo)
274} 274}
275#endif 275#endif
276 276
277RETSIGTYPE 277void
278popen_timeout_alarm_handler (int signo) 278popen_timeout_alarm_handler (int signo)
279{ 279{
280 int fh; 280 int fh;
diff --git a/plugins/popen.h b/plugins/popen.h
index a5dd8fa7..1ea69632 100644
--- a/plugins/popen.h
+++ b/plugins/popen.h
@@ -5,7 +5,7 @@
5 5
6FILE *spopen (const char *); 6FILE *spopen (const char *);
7int spclose (FILE *); 7int spclose (FILE *);
8RETSIGTYPE popen_timeout_alarm_handler (int); 8void popen_timeout_alarm_handler (int);
9 9
10pid_t *childpid=NULL; 10pid_t *childpid=NULL;
11int *child_stderr_array=NULL; 11int *child_stderr_array=NULL;