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.c | |
| 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.c')
| -rw-r--r-- | plugins/popen.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/popen.c b/plugins/popen.c index 557fb44e..9eb49b62 100644 --- a/plugins/popen.c +++ b/plugins/popen.c @@ -39,9 +39,9 @@ *****************************************************************************/ #include "common.h" +#include "utils.h" /* extern so plugin has pid to kill exec'd process on timeouts */ -extern int timeout_interval; extern pid_t *childpid; extern int *child_stderr_array; extern FILE *child_process; @@ -76,8 +76,6 @@ RETSIGTYPE popen_timeout_alarm_handler (int); #define SIG_ERR ((Sigfunc *)-1) #endif -#define min(a,b) ((a) < (b) ? (a) : (b)) -#define max(a,b) ((a) > (b) ? (a) : (b)) char *pname = NULL; /* caller can set this from argv[0] */ |