[nagiosplug] plugins: rename runcmd's signal handler.
Nagios Plugin Development
nagios-plugins at users.sourceforge.net
Sun May 12 14:30:35 CEST 2013
Module: nagiosplug
Branch: master
Commit: 332c6ef2c7480a23f3c2fa59f5cd2c88db8d9919
Author: Diego Elio Pettenò <flameeyes at flameeyes.eu>
Committer: Holger Weiss <holger at zedat.fu-berlin.de>
Date: Fri Aug 17 19:14:01 2012 -0700
URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=332c6ef
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.
---
plugins/check_dig.c | 2 +-
plugins/check_dns.c | 2 +-
plugins/runcmd.c | 2 +-
plugins/runcmd.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 3c80cb7..c113d87 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -78,7 +78,7 @@ main (int argc, char **argv)
textdomain (PACKAGE);
/* Set signal handling and alarm */
- if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR)
+ if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR)
usage_va(_("Cannot catch SIGALRM"));
/* Parse extra opts if any */
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 91af730..ac6cfc3 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -91,7 +91,7 @@ main (int argc, char **argv)
textdomain (PACKAGE);
/* Set signal handling and alarm */
- if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
+ if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
usage_va(_("Cannot catch SIGALRM"));
}
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index 7574b12..8aba1e3 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -256,7 +256,7 @@ np_runcmd_close(int fd)
void
-popen_timeout_alarm_handler (int signo)
+runcmd_timeout_alarm_handler (int signo)
{
size_t i;
diff --git a/plugins/runcmd.h b/plugins/runcmd.h
index 211dee2..5957562 100644
--- a/plugins/runcmd.h
+++ b/plugins/runcmd.h
@@ -39,7 +39,7 @@ typedef struct output output;
/** prototypes **/
int np_runcmd(const char *, output *, output *, int);
-void popen_timeout_alarm_handler(int)
+void runcmd_timeout_alarm_handler(int)
__attribute__((__noreturn__));
/* only multi-threaded plugins need to bother with this */
More information about the Commits
mailing list