35 files changed, 50 insertions, 125 deletions

diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 7080c695..cc2ec75b 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -410,9 +410,6 @@ void
 print_usage (void)
 {
         printf ("\n\
-Usage: %s [-f46] [-t timeout] [-i identity] [-l user] -H <host> \n\
-  -C <command> [-n name] [-s servicelist] [-O outputfile] [-p port]\n",
-                progname);
-                                        
-        printf (_(UT_HLP_VRS), progname, progname);
+Usage: %s [-f46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n\
+          [-n name] [-s servicelist] [-O outputfile] [-p port]\n", progname);
 }
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 823ea01c..5bed80d4 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -357,6 +357,4 @@ print_usage (void)
 Usage: %s -H host -l lookup [-p <server port>] [-T <query type>]\n\
          [-w <warning interval>] [-c <critical interval>] [-t <timeout>]\n\
          [-a <expected answer address>] [-v]\n", progname);
-                                 
-        printf (UT_HLP_VRS, progname, progname);
 }
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 70cd5480..109420a1 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -638,7 +638,5 @@ print_usage (void)
 {
         printf ("\
 Usage: %s -w limit -c limit [-p path | -x device] [-t timeout] [-m] [-e]\n\
-        [-v] [-q]\n", progname);
-
-        printf (UT_HLP_VRS, progname, progname);
+          [-v] [-q]\n", progname);
 }
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 579c51a8..492fa176 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -427,6 +427,4 @@ print_usage (void)
 {
         printf ("\
 Usage: %s -H host [-s server] [-a expected-address] [-A] [-t timeout]\n", progname);
-
-        printf (UT_HLP_VRS, progname, progname);
 }
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index c621b9f1..e0c38d32 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -41,7 +41,7 @@ main (int argc, char **argv)
         textdomain (PACKAGE);
 
         if (argc < 2)
-                usage4 (_("Incorrect number of arguments supplied"));
+                usage4 (_("Could not parse arguments"));
         else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) {
                 print_revision (progname, revision);
                 exit (STATE_OK);
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 3baf52f2..0b23f79e 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -400,5 +400,4 @@ void
 print_usage (void)
 {
         printf ("Usage: %s <host_address>\n", progname);
-        printf (UT_HLP_VRS, progname, progname);
 }
diff --git a/plugins/check_game.c b/plugins/check_game.c
index a194ab25..9b13d94b 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -329,15 +329,12 @@ Notes:\n\
 
 
 
-
 void
 print_usage (void)
 {
         printf ("\
 Usage: %s <game> <ip_address> [-p port] [-gf game_field] [-mf map_field]\n\
-  [-pf ping_field]\n", progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
+          [-pf ping_field]\n", progname);
 }
 
 /******************************************************************************
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index b9b3f7f3..816ce19b 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -400,6 +400,4 @@ print_usage (void)
 {
         printf (_("\
 Usage: %s -H host [-C community]\n"), progname);
-
-        printf (UT_HLP_VRS, progname, progname);
 }
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 125052fe..f3340268 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -1491,12 +1491,10 @@ void
 print_usage (void)
 {
         printf (_("\
-Usage: %s (-H <vhost> | -I <IP-address>) [-u <uri>] [-p <port>]\n\
-  [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\
-  [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
-  [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\
-  [-P string] [-m min_pg_size] [-4|-6] [-N] [-M <age>] [-A string]\n\
-  [-k string]\n"), progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
+Usage: %s -H <vhost> | -I <IP-address>) [-u <uri>] [-p <port>]\n\
+          [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\
+          [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
+          [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\
+          [-P string] [-m min_pg_size] [-4|-6] [-N] [-M <age>] [-A string]\n\
+          [-k string]\n"), progname);
 }
diff --git a/plugins/check_ide-smart.c b/plugins/check_ide-smart.c
index aa74f980..9ebef6cd 100644
--- a/plugins/check_ide-smart.c
+++ b/plugins/check_ide-smart.c
@@ -398,8 +398,6 @@ Usage: %s [DEVICE] [OPTION]\n\
     Turn off automatic offline tests\n\
  -n, --net-saint\n\
     Output suitable for Net Saint\n", progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
 }
 
 
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 80c0907a..9664c0fb 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -329,14 +329,13 @@ print_help (void)
 
 
 
-
 void
 print_usage (void)
 {
         printf ("\
 Usage: %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]\n\
-  [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]%s\n\
-(Note: all times are in seconds.)\n",
+         [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]%s\n",
+//(Note: all times are in seconds.)\n",
                 progname,
 #ifdef HAVE_LDAP_SET_OPTION
                         " [-2|-3] [-4|-6]"
@@ -344,6 +343,4 @@ Usage: %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]\n\
                         ""
 #endif
                         );
-
-        printf (UT_HLP_VRS, progname, progname);
 }
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 2112d1cf..d9833b64 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -320,6 +320,4 @@ void
 print_usage (void)
 {
         printf ("Usage: %s -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15\n", progname);
-                                        
-        printf (UT_HLP_VRS, progname, progname);
 }
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index cc4714cf..5dfee720 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -306,9 +306,6 @@ validate_arguments (void)
 
 
 
-
-
-
 void
 print_help (void)
 {
@@ -372,7 +369,6 @@ this plugin works well for monitoring that kind of data as well.\n\n"));
 
 
 
-
 /* original command line: 
          <log_file> <expire_minutes> <AVG|MAX> <variable> <vwl> <vcl> <label> [units] */
 
@@ -381,7 +377,5 @@ print_usage (void)
 {
         printf ("\
 Usage: %s -F log_file -a <AVG | MAX> -v variable -w warning -c critical\n\
-  [-l label] [-u units] [-e expire_minutes] [-t timeout] [-v]\n", progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
+         [-l label] [-u units] [-e expire_minutes] [-t timeout] [-v]\n", progname);
 }
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 69778e35..9b408a42 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -359,13 +359,10 @@ the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results.\n\n"));
 
 
 
-
 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);
-        
-        printf (UT_HLP_VRS, progname, progname);
+          [-e expire_minutes] [-t timeout] [-v]\n", progname);
 }
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 5863e1a7..1061fabd 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -311,5 +311,4 @@ print_usage (void)
         printf ("\
 Usage: %s [-d database] [-H host] [-P port] [-u user] [-p password] [-S]\n",
                 progname);
-        printf (UT_HLP_VRS, progname, progname);
 }
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 694c069c..8a10c4a7 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -303,8 +303,5 @@ void
 print_usage (void)
 {
         printf ("\
-Usage: %s -F <status log file> -e <expire_minutes> -C <process_string>\n",
-                progname);
-                                        
-        printf (UT_HLP_VRS, progname, progname);
+Usage: %s -F <status log file> -e <expire_minutes> -C <process_string>\n", progname);
 }
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 2cc45cda..67c3017e 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -684,7 +684,5 @@ void print_usage(void)
 {
         printf("\
 Usage: %s -H host -v variable [-p port] [-w warning] [-c critical]\n\
-  [-l params] [-d SHOWALL] [-t timeout]\n", progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
+          [-l params] [-d SHOWALL] [-t timeout]\n", progname);
 }
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 98b06d90..b791640f 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -989,7 +989,5 @@ void print_usage(void)
 {
         printf ("\
 Usage: %s -H host [-p port] [-v variable] [-w warning] [-c critical]\n\
-  [-t timeout].\n", progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
+          [-t timeout].\n", progname);
 }
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index ddaebdbd..2ebf62e1 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -405,18 +405,6 @@ process_arguments (int argc, char **argv)
 
 
 void
-print_usage (void)
-{
-        printf (_("\
-Usage: %s -H host [-p port] [-v variable] [-w warning] [-c critical]\n\
-  [-t timeout]\n"),
-                progname);
-        printf (_(UT_HLP_VRS), progname, progname);
-}
-
-
-
-void
 print_help (void)
 {
         char *myport;
@@ -469,3 +457,13 @@ Notes:\n\
 
         printf (_(UT_SUPPORT));
 }
+
+
+
+void
+print_usage (void)
+{
+        printf ("\
+Usage: %s -H host [-p port] [-v variable] [-w warning] [-c critical]\n\
+          [-t timeout]\n", progname);
+}
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index f97ef66c..53f9e96c 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -443,7 +443,5 @@ print_usage (void)
 {
         printf ("\
 Usage: %s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n\
-            [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n", progname);
-                                                
-        printf (UT_HLP_VRS, progname, progname);
+          [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n", progname);
 }
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index c04fb027..9fe71831 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -533,7 +533,5 @@ void
 print_usage (void)
 {
         printf ("Usage: %s -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n\
-  [-p packets] [-t timeout] [-L] [-4|-6]\n", progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
+                     [-p packets] [-t timeout] [-L] [-4|-6]\n", progname);
 }
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index ee168db2..7770ddad 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -751,8 +751,6 @@ print_usage (void)
 {
         printf ("\
 Usage: %s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n\
-  [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n\
-  [-C command] [-t timeout] [-v]\n", progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
+          [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n\
+          [-C command] [-t timeout] [-v]\n", progname);
 }
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index 54746144..90653a27 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -335,6 +335,5 @@ print_usage (void)
 {
         printf ("\
 Usage: %s -H host -F config_file -u username -p password [-n nas-id] [-P port]\n\
-  [-t timeout] [-r retries] [-e expect]\n", progname);
-        printf (UT_HLP_VRS, progname, progname);
+          [-t timeout] [-r retries] [-e expect]\n", progname);
 }
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 8df68d90..9fad2a83 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -438,7 +438,5 @@ print_usage (void)
 {
         printf ("\
 Usage: %s -H host [-e expect] [-p port] [-w warn] [-c crit]\n\
-  [-t timeout] [-v]\n", progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
+          [-t timeout] [-v]\n", progname);
 }
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 748edfca..ac208535 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -468,6 +468,5 @@ print_usage (void)
 {
         printf ("\
 Usage: %s -H host [-p port] [-e expect] [-C command] [-f from addr]\n\
-  [-w warn] [-c crit] [-t timeout] [-n] [-v] [-4|-6]\n", progname);
-        printf (UT_HLP_VRS, progname, progname);
+          [-w warn] [-c crit] [-t timeout] [-n] [-v] [-4|-6]\n", progname);
 }
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index ca6d7a37..fa4f56c5 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -950,11 +950,9 @@ print_usage (void)
 {
         printf ("\
 Usage: %s -H <ip_address> -o <OID> [-w warn_range] [-c crit_range] \n\
-  [-C community] [-s string] [-r regex] [-R regexi] [-t timeout]\n\
-  [-l label] [-u units] [-p port-number] [-d delimiter]\n\
-  [-D output-delimiter] [-m miblist] [-P snmp version]\n\
-  [-L seclevel] [-U secname] [-a authproto] [-A authpasswd]\n\
-  [-X privpasswd]\n", progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
+          [-C community] [-s string] [-r regex] [-R regexi] [-t timeout]\n\
+          [-l label] [-u units] [-p port-number] [-d delimiter]\n\
+          [-D output-delimiter] [-m miblist] [-P snmp version]\n\
+          [-L seclevel] [-U secname] [-a authproto] [-A authpasswd]\n\
+          [-X privpasswd]\n", progname);
 }
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index d1ae46bb..04916a55 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -289,7 +289,5 @@ print_usage (void)
 {
         printf ("\
 Usage: %s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
-
-        printf (UT_HLP_VRS, progname, progname);
 }
 
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 6a448e10..3a3ec35c 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -517,6 +517,4 @@ print_usage (void)
         printf ("Usage:\n\
  %s [-av] -w <percent_free>%% -c <percent_free>%%\n\
  %s [-av] -w <bytes_free> -c <bytes_free>\n", progname, progname);
- 
- printf (UT_HLP_VRS, progname, progname);
 }
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 405a7629..41feb97f 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -795,10 +795,8 @@ print_usage (void)
 {
         printf ("\
 Usage: %s -H host -p port [-w <warning time>] [-c <critical time>]\n\
-  [-s <send string>] [-e <expect string>] [-q <quit string>]\n\
-  [-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n\
-  [-r <refuse state>] [-v] [-4|-6] [-j] [-D <days to cert expiry>]\n\
-  [-S <use SSL>]\n", progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
+          [-s <send string>] [-e <expect string>] [-q <quit string>]\n\
+          [-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n\
+          [-r <refuse state>] [-v] [-4|-6] [-j] [-D <days to cert expiry>]\n\
+          [-S <use SSL>]\n", progname);
 }
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 94c33b6c..5d07f545 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -359,7 +359,5 @@ print_usage (void)
 {
         printf ("\
 Usage: %s -H <host_address> [-p port] [-u] [-w variance] [-c variance]\n\
-    [-W connect_time] [-C connect_time] [-t timeout]\n", progname);
-                
-        printf (_(UT_HLP_VRS), progname, progname);
+          [-W connect_time] [-C connect_time] [-t timeout]\n", progname);
 }
diff --git a/plugins/check_udp.c b/plugins/check_udp.c
index 6551ed40..ea91f417 100644
--- a/plugins/check_udp.c
+++ b/plugins/check_udp.c
@@ -264,7 +264,5 @@ print_usage (void)
 {
         printf ("\
 Usage: %s -H <host_address> [-p port] [-w warn_time] [-c crit_time]\n\
-    [-e expect] [-s send] [-t to_sec] [-v]\n", progname);
-                
-        printf (UT_HLP_VRS, progname, progname);
+          [-e expect] [-s send] [-t to_sec] [-v]\n", progname);
 }
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index ee373cbd..23fb8d2b 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -32,7 +32,6 @@ const char *revision = "$Revision$";
 const char *copyright = "2000-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
-#include <locale.h>
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
@@ -649,6 +648,5 @@ print_usage (void)
 {
         printf ("\
 Usage: %s -H host -u ups [-p port] [-v variable]\n\
-  [-wv warn_value] [-cv crit_value] [-to to_sec] [-T]\n", progname);
-        printf (UT_HLP_VRS, progname, progname);
+          [-wv warn_value] [-cv crit_value] [-to to_sec] [-T]\n", progname);
 }
diff --git a/plugins/check_users.c b/plugins/check_users.c
index 05ef86fd..2c24623d 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -215,6 +215,4 @@ void
 print_usage (void)
 {
         printf ("Usage: %s -w <users> -c <users>\n", progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
 }
diff --git a/plugins/negate.c b/plugins/negate.c
index e03f7e68..74a9a9dd 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -239,11 +239,10 @@ print_help (void)
 {
         print_revision (progname, revision);
 
-        printf (_(COPYRIGHT), copyright, email);
+        printf (COPYRIGHT, copyright, email);
 
         printf (_("\
-Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).\n\
-\n"));
+Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).\n\n"));
 
         print_usage ();
 
@@ -274,8 +273,5 @@ Otherwise, the output state of the wrapped plugin is unchanged.\n"));
 void
 print_usage (void)
 {
-        printf ("Usage: %s [-t timeout] <definition of wrapped plugin>\n",
-                progname);
-                                        
-        printf (UT_HLP_VRS, progname, progname);
+        printf ("Usage: %s [-t timeout] <definition of wrapped plugin>\n",progname);
 }
diff --git a/plugins/urlize.c b/plugins/urlize.c
index e1d02ef8..3564e469 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -163,6 +163,4 @@ void
 print_usage (void)
 {
         printf ("Usage:\n %s <url> <plugin> <arg1> ... <argN>\n", progname);
-        
-        printf (UT_HLP_VRS, progname, progname);
 }