summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorLorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>2023-09-30 20:55:35 (GMT)
committerGitHub <noreply@github.com>2023-09-30 20:55:35 (GMT)
commit60ecb14b7c1db72c49e3fa6b4338c9365d303451 (patch)
treef07d0e5446e007b9961ac004fbdf5d861008aef3 /plugins
parentbc2d1e4b5ecd5fc9270b8d8a65cbd445b7fb783f (diff)
parenta4c7111f90b00e5060eeebd73b71f67e6e161607 (diff)
downloadmonitoring-plugins-60ecb14b7c1db72c49e3fa6b4338c9365d303451.tar.gz
Merge branch 'master' into autoconf_fix
Diffstat (limited to 'plugins')
-rw-r--r--plugins/netutils.h2
-rw-r--r--plugins/popen.c8
-rw-r--r--plugins/popen.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/netutils.h b/plugins/netutils.h
index d7ee0dd..ea653e7 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 b395f14..036bc60 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 a5dd8fa..1ea6963 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;