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

diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 8f6cde99ad60b8d652dd5e15610f6ded8b87762f..20ae62833a53e88ffc85baddbcad38d36861120d 100644 (file)
--- 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 a500cdcfaa0f3e99b0a02652df797be7d254da0c..14c0da5a56e3516b3e6316a869dc9da1c9216bec 100644 (file)
--- 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 437bbbf21aca536cfd2b82f516856f352eae9a59..0cab9ac51b047727f82028a646edc8c393fb4ebb 100644 (file)
--- 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 9ab001f7eea61cdcf8ef5a61e2012f5d374210b2..d64431a8f9435753157fc70aea99a4420ea9b052 100644 (file)
--- 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 8647330c88798f2859deb0fc3f126d710758d7f5..74236d9b7d9c6d6dda6af2b2fbe25019de4887dd 100644 (file)
--- 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 3a8b9f57e6927b7f1272d6ebb67084021f386b7a..c8492d8f172aa846eedbbb17cdc7bad73492fe67 100644 (file)
--- 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 af6044a0e26e661fcbaafbad29c683d7a40d7802..5fdfc8ac3c59e0ffed631fc001f58aa7595dc783 100644 (file)
--- 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 0dc0380a76c5525a7db5adf22f7242f0fb811a7d..07b89acbf946dc314cbcc453ad33c6daa203ac00 100644 (file)
--- 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 616c3e0d9a19ae1df49bee1764b17599515ff5df..8322dbb3bb092c0a38ad94c697c8565a01b123d1 100644 (file)
--- 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 2badd4abc5142f258020a77cbec71b63410ccfe0..58717bffe8547194d603d35b1dfb802db99e3ab5 100644 (file)
--- 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 b9c277b36684d6432513e66cf73b5fbbcdf88737..5bbce5007e7796e04287baa882f40bdf41246a03 100644 (file)
--- 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 703a1ba7e974de8402e24d1935844be629c13955..0564f7c8c97196c61146cfb90c6351f45dd0b100 100644 (file)
--- 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 bb2ae6dd8ef7c58c7e057ab454bb88b9dcf0210a..7c36d116b8be3c5e30491699d0ed1be54f2e7f3b 100644 (file)
--- 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 15f3dc33a26def20689db2e7c5a645ec968b9773..c7fc74596948d94ab76c24885fc3637ecea6f639 100644 (file)
--- 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 6a21f90175684db0d7d8faabfd85e7da4a7bf0e6..a6d2e249c4373d709260d186337df7e3c5d523bb 100644 (file)
--- 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 fea87dae76df198f9b8c9e0cfe5087a6698c95f8..cb85dc66a3b646611751df5fa5a6ad05b28afb42 100644 (file)
--- 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 bbf47f07be755ec298d22ee5271f424090953e49..5c3b81074402875a945889433b0adad9987d6cae 100644 (file)
--- 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 0e090542217f46365b52e127fdaa4243a0757190..6d8ef06d567d6d1a4dbc9a1e1c42a2d747657016 100644 (file)
--- 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 b7f32c7c7f7aab5a17ac8fca88d249164e10babe..d1e1b7c57a1bd8554abdaa23e075e3dc8bbf75b2 100644 (file)
--- 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 b15ad6e7870726ff2e8af130d60f5eb6d3c04019..405b417b1e0a9d0c846a820cfd2753fb096f4d97 100644 (file)
--- 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 59ad7d0396bd994337bda387eaf348b641e7d53e..9a8f42a005766f1d67654a2f912b3ace93354c88 100644 (file)
--- 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 696af65600628e027ad49bf1ea0857b965ae37e0..3322494847c92ee5811f6c236d1b8e4010698e85 100644 (file)
--- 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 5167eb584d35a94f37af92e135cc53fcb5aacc72..c7dff3d21f2f6b824c8aeee27620065323111b89 100644 (file)
--- 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 46dd044d11ff5f204252c449cf0e8c89da11677f..f9bbd1227b379c1fbb37bc390e220f12ac52f56a 100644 (file)
--- 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 064c65e4a7a2c954571e06aa79ddafc2496f8ae6..f2d722ce91afc82da6f2af3724a86da952b44eef 100644 (file)
--- 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 da70c5de0ff87279ca2f4de7379bf00bc4fd1871..ed51e94ad560d62cdb60cf079bbd076186258228 100644 (file)
--- 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 7c4fe41a8b08133fe20d0c7ddbaee76f324a7daf..042a7d5a5541e466c874f260159d7db029d31cac 100644 (file)
--- 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 3706a72b16ae62e0e3015b74993449b1b63ed1e0..fb7cae1aee7e6644b645405b5c941b071d969570 100644 (file)
--- 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 78e17b067f2a1e99b64f57c0b56e8efd836fbead..4006031f183f3ddd98f94da01935f5527a50bef6 100644 (file)
--- 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 0417bad165f5b5d42327633ab0282edb7cf61795..23f8973cd6a2b4dcccf650a68571f1ae8b78a48f 100644 (file)
--- 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 93ef46b2ffdcda6bbca606a0286cb95518fa5c0d..02838a67f5a2cf6602ee2e7d909c03b360c8ef5a 100644 (file)
--- 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 */