Răsfoiți Sursa

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.
Diego Elio Petten 13 ani în urmă
părinte
comite
332c6ef2c7
4 a modificat fișierele cu 4 adăugiri și 4 ștergeri
  1. 1 1
      plugins/check_dig.c
  2. 1 1
      plugins/check_dns.c
  3. 1 1
      plugins/runcmd.c
  4. 1 1
      plugins/runcmd.h

+ 1 - 1
plugins/check_dig.c

@@ -78,7 +78,7 @@ main (int argc, char **argv)
   textdomain (PACKAGE);
   textdomain (PACKAGE);
 
 
   /* Set signal handling and alarm */
   /* 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"));
     usage_va(_("Cannot catch SIGALRM"));
 
 
   /* Parse extra opts if any */
   /* Parse extra opts if any */

+ 1 - 1
plugins/check_dns.c

@@ -91,7 +91,7 @@ main (int argc, char **argv)
   textdomain (PACKAGE);
   textdomain (PACKAGE);
 
 
   /* Set signal handling and alarm */
   /* 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"));
     usage_va(_("Cannot catch SIGALRM"));
   }
   }
 
 

+ 1 - 1
plugins/runcmd.c

@@ -256,7 +256,7 @@ np_runcmd_close(int fd)
 
 
 
 
 void
 void
-popen_timeout_alarm_handler (int signo)
+runcmd_timeout_alarm_handler (int signo)
 {
 {
 	size_t i;
 	size_t i;
 
 

+ 1 - 1
plugins/runcmd.h

@@ -39,7 +39,7 @@ typedef struct output output;
 
 
 /** prototypes **/
 /** prototypes **/
 int np_runcmd(const char *, output *, output *, int);
 int np_runcmd(const char *, output *, output *, int);
-void popen_timeout_alarm_handler(int)
+void runcmd_timeout_alarm_handler(int)
 	__attribute__((__noreturn__));
 	__attribute__((__noreturn__));
 
 
 /* only multi-threaded plugins need to bother with this */
 /* only multi-threaded plugins need to bother with this */