fixes from richard brodie (tracker id 1216576)

[nagiosplug.git] / plugins / check_mrtgtraf.c

diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 9b408a4244ebf5e018aab55a3bfa261610ad091b..877072ce2e89f72582815b6924747717bed0658e 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 */
@@ -260,9 +260,7 @@ process_arguments (int argc, char **argv)
                        print_help ();
                        exit (STATE_OK);
                case '?':                                                                       /* help */
-                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-                       print_usage ();
-                       exit (STATE_UNKNOWN);
+                       usage2 (_("Unknown argument"), optarg);
                }
        }
 
@@ -304,7 +302,6 @@ process_arguments (int argc, char **argv)
 }
 
 
-
 int
 validate_arguments (void)
 {
@@ -312,7 +309,6 @@ validate_arguments (void)
 }
 
 
-
 void
 print_help (void)
 {
@@ -321,6 +317,14 @@ print_help (void)
        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
        printf (COPYRIGHT, copyright, email);
 
+       printf (_("\n\
+This plugin will check the incoming/outgoing transfer rates of a router,\n\
+switch, etc recorded in an MRTG log.  If the newest log entry is older\n\
+than <expire_minutes>, a WARNING status is returned. If either the\n\
+incoming or outgoing rates exceed the <icl> or <ocl> thresholds (in\n\
+Bytes/sec), a CRITICAL status results.  If either of the rates exceed\n\
+the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results.\n\n"));
+
        print_usage ();
 
        printf (_(UT_HELP_VRSN));
@@ -337,14 +341,6 @@ print_help (void)
  -c, --critical\n\
    Critical threshold pair \"<incoming>,<outgoing>\"\n"));
 
-       printf (_("\n\
-This plugin will check the incoming/outgoing transfer rates of a router,\n\
-switch, etc recorded in an MRTG log.  If the newest log entry is older\n\
-than <expire_minutes>, a WARNING status is returned. If either the\n\
-incoming or outgoing rates exceed the <icl> or <ocl> thresholds (in\n\
-Bytes/sec), a CRITICAL status results.  If either of the rates exceed\n\
-the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results.\n\n"));
-
        printf (_("Notes:\n\
 - MRTG stands for Multi Router Traffic Grapher. It can be downloaded from\n\
   http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html\n\
@@ -363,6 +359,6 @@ void
 print_usage (void)
 {
        printf ("\
-Usage: %s -F <log_file> -a <AVG | MAX> -v <variable> -w <warning_pair> -c <critical_pair>\n\
-          [-e expire_minutes] [-t timeout] [-v]\n", progname);
+Usage: %s -F <log_file> -a <AVG | MAX> -v <variable> -w <warning_pair>\n\
+                      -c <critical_pair> [-e expire_minutes] [-t timeout] [-v]\n", progname);
 }