diff options
author | Diego Elio Pettenò <flameeyes@flameeyes.eu> | 2012-08-17 19:14:01 -0700 |
---|---|---|
committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2013-05-12 14:15:13 +0200 |
commit | 332c6ef2c7480a23f3c2fa59f5cd2c88db8d9919 (patch) | |
tree | 85ff0cecb0f8d1eae50c1a50d0c2789c32b28a93 /plugins | |
parent | 08f5670a790da20c33ef3c0950db527e507f0479 (diff) | |
download | monitoring-plugins-332c6ef2c7480a23f3c2fa59f5cd2c88db8d9919.tar.gz |
plugins: rename runcmd's signal handler.
The previous name would collide with popen's. Even if the two are
never used together, it's still a good idea not to have the same
symbol in multiple object files.
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/check_dig.c | 2 | ||||
-rw-r--r-- | plugins/check_dns.c | 2 | ||||
-rw-r--r-- | plugins/runcmd.c | 2 | ||||
-rw-r--r-- | plugins/runcmd.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/check_dig.c b/plugins/check_dig.c index 3c80cb72..c113d87b 100644 --- a/plugins/check_dig.c +++ b/plugins/check_dig.c | |||
@@ -78,7 +78,7 @@ main (int argc, char **argv) | |||
78 | textdomain (PACKAGE); | 78 | textdomain (PACKAGE); |
79 | 79 | ||
80 | /* Set signal handling and alarm */ | 80 | /* Set signal handling and alarm */ |
81 | if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) | 81 | if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) |
82 | usage_va(_("Cannot catch SIGALRM")); | 82 | usage_va(_("Cannot catch SIGALRM")); |
83 | 83 | ||
84 | /* Parse extra opts if any */ | 84 | /* Parse extra opts if any */ |
diff --git a/plugins/check_dns.c b/plugins/check_dns.c index 91af730b..ac6cfc38 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c | |||
@@ -91,7 +91,7 @@ main (int argc, char **argv) | |||
91 | textdomain (PACKAGE); | 91 | textdomain (PACKAGE); |
92 | 92 | ||
93 | /* Set signal handling and alarm */ | 93 | /* Set signal handling and alarm */ |
94 | if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) { | 94 | if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) { |
95 | usage_va(_("Cannot catch SIGALRM")); | 95 | usage_va(_("Cannot catch SIGALRM")); |
96 | } | 96 | } |
97 | 97 | ||
diff --git a/plugins/runcmd.c b/plugins/runcmd.c index 7574b121..8aba1e33 100644 --- a/plugins/runcmd.c +++ b/plugins/runcmd.c | |||
@@ -256,7 +256,7 @@ np_runcmd_close(int fd) | |||
256 | 256 | ||
257 | 257 | ||
258 | void | 258 | void |
259 | popen_timeout_alarm_handler (int signo) | 259 | runcmd_timeout_alarm_handler (int signo) |
260 | { | 260 | { |
261 | size_t i; | 261 | size_t i; |
262 | 262 | ||
diff --git a/plugins/runcmd.h b/plugins/runcmd.h index 211dee2c..5957562b 100644 --- a/plugins/runcmd.h +++ b/plugins/runcmd.h | |||
@@ -39,7 +39,7 @@ typedef struct output output; | |||
39 | 39 | ||
40 | /** prototypes **/ | 40 | /** prototypes **/ |
41 | int np_runcmd(const char *, output *, output *, int); | 41 | int np_runcmd(const char *, output *, output *, int); |
42 | void popen_timeout_alarm_handler(int) | 42 | void runcmd_timeout_alarm_handler(int) |
43 | __attribute__((__noreturn__)); | 43 | __attribute__((__noreturn__)); |
44 | 44 | ||
45 | /* only multi-threaded plugins need to bother with this */ | 45 | /* only multi-threaded plugins need to bother with this */ |