reverting my changes from !=TRUE to == ERROR, that's not good ;-( sorry

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@998 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index cc2ec75b49039836cebc02497bd9f14f6b3c34be..6d0f4c2c8f4629ef37de99bc12706733f85c0e64 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* Set signal handling and alarm timeout */

diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 8f88316faa21c4ef837fd459f0a97638f94f8ff0..390718680685f7a638013fe3622d2cb8b43fbdd3 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)
                usage4 (_("Cannot catch SIGALRM"));
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* get the command to run */

diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 71a6807957079310316c1f1cf0d95645857d876d..669a1cd6b1fd62d9488b887a3e748f08a9288da1 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        for (me = mount_list; me; me = me->me_next) {

diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 2a8f459275fbc2cf13214b0cc471a36be6db26dc..55165fcb34060dc6317d218abf76d1305ac4525d 100644 (file)
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -71,7 +71,7 @@ main (int argc, char **argv)
                usage4 (_("Cannot catch SIGALRM"));
        }
 
-       if (process_arguments (argc, argv) != TRUE) {
+       if (process_arguments (argc, argv) == ERROR) {
                usage4 (_("Could not parse arguments"));
        }
 

diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index ce62a7c86104c845c471902bad51ce551d3828f3..7f05d4d53038ab297245a7eebc36bd409caf7285 100644 (file)
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -69,7 +69,7 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        server = strscpy (server, server_name);

diff --git a/plugins/check_game.c b/plugins/check_game.c
index c0f9a47dc8a92eb8be04c27dde459b3e21425844..9a6e53e70480efdc0fe4df16661512882f8d1120 100644 (file)
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -65,7 +65,7 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
        
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        result = STATE_OK;

diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 678d5c80c72c119acfde15f5b660dcc0b9e3b95c..d49661ad3498007411557bf214087ecc5213fed8 100644 (file)
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -85,7 +85,7 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* removed ' 2>1' at end of command 10/27/1999 - EG */

diff --git a/plugins/check_http.c b/plugins/check_http.c
index 3ff834b3193bc3f31684734bb8495b390bf40cd0..c0b18fc84c46fdb4b27769645c7743d42493c52c 100644 (file)
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -145,7 +145,7 @@ main (int argc, char **argv)
        asprintf (&user_agent, "User-Agent: check_http/%s (nagios-plugins %s)",
                  clean_revstring (revision), VERSION);
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        if (strstr (timestamp, ":")) {

diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index dfdd837476f6d27eb4868a342081fddd09e65a51..e77ad30835da50f2f2e6631149ca328bd693c6c9 100644 (file)
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -74,7 +74,7 @@ main (int argc, char *argv[])
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */

diff --git a/plugins/check_load.c b/plugins/check_load.c
index d9833b6404ffc25f55202b65d9746fed2c60ce36..1b7865c7be67fe78a3cd093a2c45226976467407 100644 (file)
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -74,7 +74,7 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
 #if HAVE_GETLOADAVG==1

diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index cf3cc851e206da4f28b638bf4584fdda94c43bc4..f895321f742aa67af8612df9fe909caceebbc8f1 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("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 0f7afbc8ec4643f2ee392393173bc36b5ac83ca2..096b3bded3478c95778d8b001a704deb2bf202dd 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* open the MRTG log file for reading */

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 1061fabd6b1761fdb06d2d73259ef001835693cf..1e7a82f92011eb5a6bec752b379b4252e1a3f22d 100644 (file)
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -59,7 +59,7 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* initialize mysql  */

diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 29abc2a8e22b90c6621c861b7e97c17f6de335c3..b567fe10c8e83f91ae26c50ed9ae717754e55dc3 100644 (file)
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -66,7 +66,7 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* Set signal handling and alarm timeout */

diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 4826d68722dda72c89ebea4d1f0ecfb7a8659450..03a7c5d64405b8f061a7116bbe5eb7d02df80b99 100644 (file)
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -116,7 +116,7 @@ int main(int argc, char **argv){
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if(process_arguments(argc,argv) != TRUE)
+       if(process_arguments(argc,argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */

diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 4dffba3ee919bf8f95fd9357b6f2961d6e5a74b1..53e3f1d757d01e155aa70e617e235d4ff4f7ce34 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) != TRUE)
+       if (process_arguments(argc,argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */

diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 8fb1ef409e4da8836409ae05452c1e1a1cb12aa5..756402bd34528be76a7a56893ab5f46e3ce97de6 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */

diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index a00257127ddc82cbd9e71b3da798e73d1a9f981a..e66eeaff91e9d3dc439422b169a91b93f2211851 100644 (file)
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -136,7 +136,7 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* Set signal handling and alarm */

diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 9fe71831684923d1fffa1816ce0c56c60a61eee3..4778fcf90bfe3a73c6af68e6ad6d04230b1ef4ea 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* Set signal handling and alarm */

diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 5742b72799545cfd583841f9a07ffc1d96753b58..f2fc2e5b076287a6a919105efa084ea349dce822 100644 (file)
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -120,7 +120,7 @@ main (int argc, char **argv)
        asprintf (&metric_name, "PROCS");
        metric = METRIC_PROCS;
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* Set signal handling and alarm timeout */

diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index bdb9b7aac83b8fa0412c4c8ad5cb52f4e3052129..9e1046865e2e4e0a574db7cb2bdc786e460f37f4 100644 (file)
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -113,7 +113,7 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        str = strdup ("dictionary");

diff --git a/plugins/check_real.c b/plugins/check_real.c
index f843172628ae764ecc64210693aa8feead1158fb..492848c77ed9ed20ab06c3c4b117c2ef7b2c4d8d 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */

diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index d8346426cf331a2b4df9958e57bbf4b0ecdbbbf6..f12b69e99927928e2acd3d0ce3db17f03913b643 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* initialize the HELO command with the localhostname */

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 18b7f2f4df6ab50f5acf5d9ab5aab1e6dca026c0..6fae3d1f81b03db0e9e609ed0b70c49b3b4dff05 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* create the command line to execute */

diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 04916a5513cf1fae16deb3baa8863ff33f33a745..e957c0538a898f3c3c5a427cb9ec2c8dbc36e395 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */

diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 2e5f5c7c3825c2ca5c4d75d19beab762adb9b36a..4e17163cd1e6c061cb48fc62a0da2635a1d68b8d 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
 #ifdef HAVE_PROC_MEMINFO

diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 8dacf599ffa16bbf8e1c4858018948f4e96e7bbe..418438a3e7ea23631e782962564b4ddecdc7416f 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* use default expect if none listed in process_arguments() */

diff --git a/plugins/check_time.c b/plugins/check_time.c
index b2e53745849fd975989e852d6c3557420f6330e4..dae2dd5ad031f3371614fcabcd06696d9e04b4db 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */

diff --git a/plugins/check_udp.c b/plugins/check_udp.c
index e446b933aa9c10de1542c8aafe36de22696eedef..aa8be1c2731d6dd5b4326b7d8cc2068d5d4f53a1 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */

diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 8383b09333300e8f668303288f2175ba9ebf8fea..a4d765038882a9493767af05a96113ec8ff7b0fb 100644 (file)
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -110,7 +110,7 @@ main (int argc, char **argv)
        data = strdup ("");
        message = strdup ("");
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */

diff --git a/plugins/check_users.c b/plugins/check_users.c
index 2c24623dc86143fa277d3c625bc361c8ebf8fe1e..d1b4f01898e5a8130871ef55387c86c5da112c35 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* run the command */

diff --git a/plugins/negate.c b/plugins/negate.c
index 74a9a9ddb88b806261e7248873526617c48a02ff..e35ddb9e90ca11a6f2c2bc5a74c3172cb1839c9f 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) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* Set signal handling and alarm */