aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Benoit Mortier <opensides@users.sourceforge.net> 2004-12-02 14:54:36 +0000
committerGravatar Benoit Mortier <opensides@users.sourceforge.net> 2004-12-02 14:54:36 +0000
commitdf1bd0c89ff63de64ee630e0025389651947020c (patch)
tree4669c35dbade257e0cca838fd41c28ce3bd32b7e
parentd7520c8d6f058dce6581382d56b480c73f8dddde (diff)
downloadmonitoring-plugins-df1bd0c89ff63de64ee630e0025389651947020c.tar.gz
return of process_arguments() is TRUE not OK !
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@978 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--plugins/check_by_ssh.c2
-rw-r--r--plugins/check_dig.c2
-rw-r--r--plugins/check_disk.c2
-rw-r--r--plugins/check_dns.c3
-rw-r--r--plugins/check_fping.c2
-rw-r--r--plugins/check_game.c2
-rw-r--r--plugins/check_hpjd.c2
-rw-r--r--plugins/check_ldap.c2
-rw-r--r--plugins/check_load.c2
-rw-r--r--plugins/check_mrtg.c2
-rw-r--r--plugins/check_mrtgtraf.c2
-rw-r--r--plugins/check_mysql.c2
-rw-r--r--plugins/check_nagios.c2
-rw-r--r--plugins/check_nt.c2
-rw-r--r--plugins/check_nwstat.c2
-rw-r--r--plugins/check_overcr.c2
-rw-r--r--plugins/check_pgsql.c2
-rw-r--r--plugins/check_ping.c2
-rw-r--r--plugins/check_procs.c2
-rw-r--r--plugins/check_radius.c2
-rw-r--r--plugins/check_real.c2
-rw-r--r--plugins/check_smtp.c2
-rw-r--r--plugins/check_snmp.c2
-rw-r--r--plugins/check_ssh.c2
-rw-r--r--plugins/check_swap.c2
-rw-r--r--plugins/check_tcp.c2
-rw-r--r--plugins/check_time.c2
-rw-r--r--plugins/check_udp.c2
-rw-r--r--plugins/check_ups.c2
-rw-r--r--plugins/check_users.c2
-rw-r--r--plugins/negate.c2
31 files changed, 31 insertions, 32 deletions
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 8f6cde99..20ae6283 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -68,7 +68,7 @@ main (int argc, char **argv)
textdomain (PACKAGE);
/* process arguments */
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_by_ssh: could not parse arguments\n"));
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index a500cdcf..14c0da5a 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -68,7 +68,7 @@ main (int argc, char **argv)
if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR)
usage (_("Cannot catch SIGALRM\n"));
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("Could not parse arguments\n"));
/* get the command to run */
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 437bbbf2..0cab9ac5 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -163,7 +163,7 @@ main (int argc, char **argv)
mount_list = read_filesystem_list (0);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_disk: could not parse arguments\n"));
for (me = mount_list; me; me = me->me_next) {
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 9ab001f7..d64431a8 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -72,9 +72,8 @@ main (int argc, char **argv)
return STATE_UNKNOWN;
}
- if (process_arguments (argc, argv) != OK) {
+ if (process_arguments (argc, argv) != TRUE) {
usage (_("check_dns: could not parse arguments\n"));
- return STATE_UNKNOWN;
}
/* get the command to run */
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 8647330c..74236d9b 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -67,7 +67,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_fping: could not parse arguments\n"));
server = strscpy (server, server_name);
diff --git a/plugins/check_game.c b/plugins/check_game.c
index 3a8b9f57..c8492d8f 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -67,7 +67,7 @@ main (int argc, char **argv)
// result = process_arguments (argc, argv);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_game: could not parse arguments\n"));
/* if (result != OK) {
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index af6044a0..5fdfc8ac 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -84,7 +84,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_hpjd: could not parse arguments\n"));
/* removed ' 2>1' at end of command 10/27/1999 - EG */
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 0dc0380a..07b89acb 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_ldap: could not parse arguments\n"));
/* initialize alarm signal handling */
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 616c3e0d..8322dbb3 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -73,7 +73,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_load: could not parse arguments\n"));
#if HAVE_GETLOADAVG==1
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index 2badd4ab..58717bff 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -59,7 +59,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_mrtg: could not parse arguments\n"));
/* open the MRTG log file for reading */
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index b9c277b3..5bbce500 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -62,7 +62,7 @@ main (int argc, char **argv)
char incoming_speed_rating[8];
char outgoing_speed_rating[8];
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_ldap: could not parse arguments\n"));
/* open the MRTG log file for reading */
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 703a1ba7..0564f7c8 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -55,7 +55,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_mysql: could not parse arguments\n"));
/* initialize mysql */
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index bb2ae6dd..7c36d116 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -65,7 +65,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_nagios: could not parse arguments\n"));
/* Set signal handling and alarm */
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 15f3dc33..c7fc7459 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -110,7 +110,7 @@ int main(int argc, char **argv){
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if(process_arguments(argc,argv) != OK)
+ if(process_arguments(argc,argv) != TRUE)
usage (_("check_nt: could not parse arguments\n"));
/* initialize alarm signal handling */
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 6a21f901..a6d2e249 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -121,7 +121,7 @@ main(int argc, char **argv) {
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments(argc,argv) != OK)
+ if (process_arguments(argc,argv) != TRUE)
usage (_("check_nwstat: could not parse arguments\n"));
/* initialize alarm signal handling */
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index fea87dae..cb85dc66 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -85,7 +85,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_overcr: could not parse arguments\n"));
/* initialize alarm signal handling */
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index bbf47f07..5c3b8107 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -132,7 +132,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_pgsql: could not parse arguments\n"));
/* Set signal handling and alarm */
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 0e090542..6d8ef06d 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -78,7 +78,7 @@ main (int argc, char **argv)
addresses = malloc (sizeof(char*) * max_addr);
addresses[0] = NULL;
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_ping: could not parse arguments\n"));
/* Set signal handling and alarm */
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index b7f32c7c..d1e1b7c5 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -115,7 +115,7 @@ main (int argc, char **argv)
asprintf (&metric_name, "PROCS");
metric = METRIC_PROCS;
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_procs: could not parse arguments\n"));
/* Set signal handling and alarm timeout */
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index b15ad6e7..405b417b 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -112,7 +112,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_radius: could not parse arguments\n"));
str = strdup ("dictionary");
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 59ad7d03..9a8f42a0 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -64,7 +64,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_real: could not parse arguments\n"));
/* initialize alarm signal handling */
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 696af656..33224948 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -88,7 +88,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_smtp: could not parse arguments\n"));
/* initialize the HELO command with the localhostname */
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 5167eb58..c7dff3d2 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -156,7 +156,7 @@ main (int argc, char **argv)
output_delim = strdup (DEFAULT_OUTPUT_DELIMITER);
miblist = strdup (DEFAULT_MIBLIST);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_snmp: could not parse arguments\n"));
/* create the command line to execute */
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 46dd044d..f9bbd122 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -57,7 +57,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_ssh: could not parse arguments\n"));
/* initialize alarm signal handling */
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 064c65e4..f2d722ce 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -89,7 +89,7 @@ main (int argc, char **argv)
tmp_status = strdup ("");
perf = strdup ("");
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("Incorrect arguments supplied\n"));
#ifdef HAVE_PROC_MEMINFO
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index da70c5de..ed51e94a 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -239,7 +239,7 @@ main (int argc, char **argv)
server_quit = QUIT;
status = strdup ("");
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_tcp: could not parse arguments\n"));
/* use default expect if none listed in process_arguments() */
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 7c4fe41a..042a7d5a 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -62,7 +62,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_time: could not parse arguments\n"));
/* initialize alarm signal handling */
diff --git a/plugins/check_udp.c b/plugins/check_udp.c
index 3706a72b..fb7cae1a 100644
--- a/plugins/check_udp.c
+++ b/plugins/check_udp.c
@@ -51,7 +51,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_udp: could not parse arguments\n"));
/* initialize alarm signal handling */
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 78e17b06..4006031f 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -111,7 +111,7 @@ main (int argc, char **argv)
data = strdup ("");
message = strdup ("");
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_ups: could not parse arguments\n"));
/* initialize alarm signal handling */
diff --git a/plugins/check_users.c b/plugins/check_users.c
index 0417bad1..23f8973c 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -50,7 +50,7 @@ main (int argc, char **argv)
perf = strdup("");
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("check_users: could not parse arguments\n"));
/* run the command */
diff --git a/plugins/negate.c b/plugins/negate.c
index 93ef46b2..02838a67 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -83,7 +83,7 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
+ if (process_arguments (argc, argv) != TRUE)
usage (_("negate: could not parse arguments\n"));
/* Set signal handling and alarm */