diff options
author | Christian Tacke <8560110+ChristianTacke@users.noreply.github.com> | 2019-12-25 21:41:17 +0100 |
---|---|---|
committer | Sven Nierlein <sven@nierlein.org> | 2020-01-07 10:22:39 +0100 |
commit | 9da7cd76813870632ff93659d176ead0848b8ee9 (patch) | |
tree | b85f1d9ceb4bd2bfc829f99bf84057646fa8cfaa /plugins/popen.h | |
parent | 7693af147926d0eb7369a43070d114b6bd79dc70 (diff) | |
download | monitoring-plugins-9da7cd76813870632ff93659d176ead0848b8ee9.tar.gz |
Fix timeout_interval declarations
There are different declarations for timeout_interval:
lib/utils_base.c has the definition:
unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
lib/utils_base.h has the appropiate declaration:
extern unsigned int timeout_interval;
plugins/popen.h has an extra declaration:
extern unsigned int timeout_interval;
This doesn't hurt, but it's a dupe. The one in utils_base.h
should be enough, so remove this one.
plugins/popen.c has a WRONG one:
extern int timeout_interval;
Remove it!
Use #include "utils.h" to get the right one.
This makes the local defines for max/min unnecassary, so
remove them also.
Diffstat (limited to 'plugins/popen.h')
-rw-r--r-- | plugins/popen.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/popen.h b/plugins/popen.h index fc7e78e2..a5dd8fa7 100644 --- a/plugins/popen.h +++ b/plugins/popen.h | |||
@@ -7,7 +7,6 @@ FILE *spopen (const char *); | |||
7 | int spclose (FILE *); | 7 | int spclose (FILE *); |
8 | RETSIGTYPE popen_timeout_alarm_handler (int); | 8 | RETSIGTYPE popen_timeout_alarm_handler (int); |
9 | 9 | ||
10 | extern unsigned int timeout_interval; | ||
11 | pid_t *childpid=NULL; | 10 | pid_t *childpid=NULL; |
12 | int *child_stderr_array=NULL; | 11 | int *child_stderr_array=NULL; |
13 | FILE *child_process=NULL; | 12 | FILE *child_process=NULL; |