[Nagiosplug-checkins] nagiosplug/plugins check_by_ssh.c,1.29,1.30 check_dig.c,1.34,1.35 check_disk.c,1.52,1.53 check_dns.c,1.37,1.38 check_dummy.c,1.11,1.12 check_fping.c,1.20,1.21 check_game.c,1.17,1.18 check_hpjd.c,1.26,1.27 check_http.c,1.72,1.73 check_ide-smart.c,1.10,1.11 check_ldap.c,1.24,1.25 check_load.c,1.24,1.25 check_mrtg.c,1.19,1.20 check_mrtgtraf.c,1.20,1.21 check_mysql.c,1.21,1.22 check_nagios.c,1.19,1.20 check_nt.c,1.31,1.32 check_nwstat.c,1.23,1.24 check_overcr.c,1.14,1.15 check_pgsql.c,1.26,1.27 check_ping.c,1.36,1.37 check_procs.c,1.37,1.38 check_radius.c,1.17,1.18 check_real.c,1.20,1.21 check_smtp.c,1.34,1.35 check_snmp.c,1.45,1.46 check_ssh.c,1.23,1.24 check_swap.c,1.37,1.38 check_tcp.c,1.51,1.52 check_time.c,1.20,1.21 check_udp.c,1.20,1.21 check_ups.c,1.22,1.23 check_users.c,1.16,1.17 negate.c,1.21,1.22 urlize.c,1.15,1.16

[Benoit Mortier]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17376/plugins

Modified Files:
	check_by_ssh.c check_dig.c check_disk.c check_dns.c 
	check_dummy.c check_fping.c check_game.c check_hpjd.c 
	check_http.c check_ide-smart.c check_ldap.c check_load.c 
	check_mrtg.c check_mrtgtraf.c check_mysql.c check_nagios.c 
	check_nt.c check_nwstat.c check_overcr.c check_pgsql.c 
	check_ping.c check_procs.c check_radius.c check_real.c 
	check_smtp.c check_snmp.c check_ssh.c check_swap.c check_tcp.c 
	check_time.c check_udp.c check_ups.c check_users.c negate.c 
	urlize.c 
Log Message:
remove UT_HLP_VRS from print_usage
this was not a good idea ;-)



Index: check_mrtg.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mrtg.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- check_mrtg.c	3 Dec 2004 11:45:09 -0000	1.19
+++ check_mrtg.c	3 Dec 2004 20:28:52 -0000	1.20
@@ -306,9 +306,6 @@
 
 
 
-
-
-
 void
 print_help (void)
 {
@@ -372,7 +369,6 @@
 
 
 
-
 /* original command line: 
 	 <log_file> <expire_minutes> <AVG|MAX> <variable> <vwl> <vcl> <label> [units] */
 
@@ -381,7 +377,5 @@
 {
 	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);
 }

Index: check_dummy.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dummy.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- check_dummy.c	3 Dec 2004 11:45:09 -0000	1.11
+++ check_dummy.c	3 Dec 2004 20:28:52 -0000	1.12
@@ -41,7 +41,7 @@
 	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);

Index: check_tcp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- check_tcp.c	3 Dec 2004 16:56:27 -0000	1.51
+++ check_tcp.c	3 Dec 2004 20:28:53 -0000	1.52
@@ -795,10 +795,8 @@
 {
 	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);
 }

Index: check_overcr.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_overcr.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- check_overcr.c	3 Dec 2004 00:55:27 -0000	1.14
+++ check_overcr.c	3 Dec 2004 20:28:52 -0000	1.15
@@ -405,18 +405,6 @@
 
 
 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 @@
 
 	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);
+}

Index: check_radius.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_radius.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- check_radius.c	3 Dec 2004 16:56:27 -0000	1.17
+++ check_radius.c	3 Dec 2004 20:28:52 -0000	1.18
@@ -335,6 +335,5 @@
 {
 	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);
 }

Index: check_mrtgtraf.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mrtgtraf.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_mrtgtraf.c	3 Dec 2004 11:45:09 -0000	1.20
+++ check_mrtgtraf.c	3 Dec 2004 20:28:52 -0000	1.21
@@ -359,13 +359,10 @@
 
 
 
-
 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);
 }

Index: check_by_ssh.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_by_ssh.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- check_by_ssh.c	3 Dec 2004 11:45:09 -0000	1.29
+++ check_by_ssh.c	3 Dec 2004 20:28:51 -0000	1.30
@@ -410,9 +410,6 @@
 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);
 }

Index: check_http.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- check_http.c	3 Dec 2004 11:45:09 -0000	1.72
+++ check_http.c	3 Dec 2004 20:28:52 -0000	1.73
@@ -1491,12 +1491,10 @@
 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);
 }

Index: check_time.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_time.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_time.c	3 Dec 2004 16:56:27 -0000	1.20
+++ check_time.c	3 Dec 2004 20:28:53 -0000	1.21
@@ -359,7 +359,5 @@
 {
 	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);
 }

Index: check_ssh.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ssh.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- check_ssh.c	3 Dec 2004 17:15:27 -0000	1.23
+++ check_ssh.c	3 Dec 2004 20:28:53 -0000	1.24
@@ -289,7 +289,5 @@
 {
 	printf ("\
 Usage: %s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
-
-	printf (UT_HLP_VRS, progname, progname);
 }
 

Index: check_udp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_udp.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_udp.c	3 Dec 2004 16:56:27 -0000	1.20
+++ check_udp.c	3 Dec 2004 20:28:53 -0000	1.21
@@ -264,7 +264,5 @@
 {
 	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);
 }

Index: check_fping.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_fping.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_fping.c	3 Dec 2004 11:45:09 -0000	1.20
+++ check_fping.c	3 Dec 2004 20:28:52 -0000	1.21
@@ -400,5 +400,4 @@
 print_usage (void)
 {
 	printf ("Usage: %s <host_address>\n", progname);
-	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_users.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_users.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- check_users.c	3 Dec 2004 16:56:27 -0000	1.16
+++ check_users.c	3 Dec 2004 20:28:53 -0000	1.17
@@ -215,6 +215,4 @@
 print_usage (void)
 {
 	printf ("Usage: %s -w <users> -c <users>\n", progname);
-	
-	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_ping.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ping.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- check_ping.c	3 Dec 2004 16:56:27 -0000	1.36
+++ check_ping.c	3 Dec 2004 20:28:52 -0000	1.37
@@ -533,7 +533,5 @@
 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);
 }

Index: check_dns.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- check_dns.c	3 Dec 2004 11:45:09 -0000	1.37
+++ check_dns.c	3 Dec 2004 20:28:52 -0000	1.38
@@ -427,6 +427,4 @@
 {
 	printf ("\
 Usage: %s -H host [-s server] [-a expected-address] [-A] [-t timeout]\n", progname);
-
-	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_swap.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_swap.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- check_swap.c	3 Dec 2004 16:56:27 -0000	1.37
+++ check_swap.c	3 Dec 2004 20:28:53 -0000	1.38
@@ -517,6 +517,4 @@
 	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);
 }

Index: check_hpjd.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_hpjd.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- check_hpjd.c	3 Dec 2004 11:45:09 -0000	1.26
+++ check_hpjd.c	3 Dec 2004 20:28:52 -0000	1.27
@@ -400,6 +400,4 @@
 {
 	printf (_("\
 Usage: %s -H host [-C community]\n"), progname);
-
-	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_snmp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_snmp.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- check_snmp.c	3 Dec 2004 16:56:27 -0000	1.45
+++ check_snmp.c	3 Dec 2004 20:28:52 -0000	1.46
@@ -950,11 +950,9 @@
 {
 	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);
 }

Index: check_ide-smart.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ide-smart.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- check_ide-smart.c	3 Dec 2004 11:45:09 -0000	1.10
+++ check_ide-smart.c	3 Dec 2004 20:28:52 -0000	1.11
@@ -398,8 +398,6 @@
     Turn off automatic offline tests\n\
  -n, --net-saint\n\
     Output suitable for Net Saint\n", progname);
-	
-	printf (UT_HLP_VRS, progname, progname);
 }
 
 

Index: check_real.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_real.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_real.c	3 Dec 2004 16:56:27 -0000	1.20
+++ check_real.c	3 Dec 2004 20:28:52 -0000	1.21
@@ -438,7 +438,5 @@
 {
 	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);
 }

Index: check_mysql.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mysql.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- check_mysql.c	3 Dec 2004 11:45:09 -0000	1.21
+++ check_mysql.c	3 Dec 2004 20:28:52 -0000	1.22
@@ -311,5 +311,4 @@
 	printf ("\
 Usage: %s [-d database] [-H host] [-P port] [-u user] [-p password] [-S]\n",
 	        progname);
-	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_dig.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dig.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- check_dig.c	3 Dec 2004 11:45:09 -0000	1.34
+++ check_dig.c	3 Dec 2004 20:28:52 -0000	1.35
@@ -357,6 +357,4 @@
 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);
 }

Index: check_ldap.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ldap.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- check_ldap.c	3 Dec 2004 11:45:09 -0000	1.24
+++ check_ldap.c	3 Dec 2004 20:28:52 -0000	1.25
@@ -329,14 +329,13 @@
 
 
 
-
 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 @@
 			""
 #endif
 			);
-
-	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_ups.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ups.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- check_ups.c	3 Dec 2004 16:56:27 -0000	1.22
+++ check_ups.c	3 Dec 2004 20:28:53 -0000	1.23
@@ -32,7 +32,6 @@
 const char *copyright = "2000-2004";
 const char *email = "nagiosplug-devel at lists.sourceforge.net";
 
-#include <locale.h>
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
@@ -649,6 +648,5 @@
 {
 	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);
 }

Index: check_disk.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_disk.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- check_disk.c	3 Dec 2004 11:45:09 -0000	1.52
+++ check_disk.c	3 Dec 2004 20:28:52 -0000	1.53
@@ -638,7 +638,5 @@
 {
 	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);
 }

Index: check_nwstat.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nwstat.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- check_nwstat.c	3 Dec 2004 11:45:10 -0000	1.23
+++ check_nwstat.c	3 Dec 2004 20:28:52 -0000	1.24
@@ -989,7 +989,5 @@
 {
 	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);
 }

Index: check_pgsql.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_pgsql.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- check_pgsql.c	3 Dec 2004 16:56:27 -0000	1.26
+++ check_pgsql.c	3 Dec 2004 20:28:52 -0000	1.27
@@ -443,7 +443,5 @@
 {
 	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);
 }

Index: check_smtp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_smtp.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- check_smtp.c	3 Dec 2004 16:56:27 -0000	1.34
+++ check_smtp.c	3 Dec 2004 20:28:52 -0000	1.35
@@ -468,6 +468,5 @@
 {
 	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);
 }

Index: check_game.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_game.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- check_game.c	3 Dec 2004 11:45:09 -0000	1.17
+++ check_game.c	3 Dec 2004 20:28:52 -0000	1.18
@@ -329,15 +329,12 @@
 
 
 
-
 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);
 }
 
 /******************************************************************************

Index: check_nagios.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nagios.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- check_nagios.c	3 Dec 2004 11:45:09 -0000	1.19
+++ check_nagios.c	3 Dec 2004 20:28:52 -0000	1.20
@@ -303,8 +303,5 @@
 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);
 }

Index: check_procs.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_procs.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- check_procs.c	3 Dec 2004 16:56:27 -0000	1.37
+++ check_procs.c	3 Dec 2004 20:28:52 -0000	1.38
@@ -751,8 +751,6 @@
 {
 	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);
 }

Index: negate.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/negate.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- negate.c	3 Dec 2004 17:48:53 -0000	1.21
+++ negate.c	3 Dec 2004 20:28:53 -0000	1.22
@@ -239,11 +239,10 @@
 {
 	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 @@
 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);
 }

Index: check_nt.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nt.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- check_nt.c	3 Dec 2004 11:45:09 -0000	1.31
+++ check_nt.c	3 Dec 2004 20:28:52 -0000	1.32
@@ -684,7 +684,5 @@
 {
 	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);
 }

Index: check_load.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_load.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- check_load.c	3 Dec 2004 17:15:27 -0000	1.24
+++ check_load.c	3 Dec 2004 20:28:52 -0000	1.25
@@ -320,6 +320,4 @@
 print_usage (void)
 {
 	printf ("Usage: %s -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15\n", progname);
-					
-	printf (UT_HLP_VRS, progname, progname);
 }

Index: urlize.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/urlize.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- urlize.c	3 Dec 2004 16:56:27 -0000	1.15
+++ urlize.c	3 Dec 2004 20:28:53 -0000	1.16
@@ -163,6 +163,4 @@
 print_usage (void)
 {
 	printf ("Usage:\n %s <url> <plugin> <arg1> ... <argN>\n", progname);
-	
-	printf (UT_HLP_VRS, progname, progname);
 }