[Nagiosplug-checkins] nagiosplug/plugins check_by_ssh.c,1.28,1.29 check_dig.c,1.33,1.34 check_disk.c,1.51,1.52 check_dns.c,1.36,1.37 check_dummy.c,1.10,1.11 check_fping.c,1.19,1.20 check_game.c,1.16,1.17 check_hpjd.c,1.25,1.26 check_http.c,1.71,1.72 check_ide-smart.c,1.9,1.10 check_ldap.c,1.23,1.24 check_load.c,1.21,1.22 check_mrtg.c,1.18,1.19 check_mrtgtraf.c,1.19,1.20 check_mysql.c,1.20,1.21 check_nagios.c,1.18,1.19 check_nt.c,1.30,1.31 check_nwstat.c,1.22,1.23

[Benoit Mortier]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23201/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 
Log Message:

internationalization fixes and help fixes



Index: check_mrtg.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mrtg.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- check_mrtg.c	3 Dec 2004 00:55:27 -0000	1.18
+++ check_mrtg.c	3 Dec 2004 11:45:09 -0000	1.19
@@ -379,8 +379,9 @@
 void
 print_usage (void)
 {
-	printf (_("\
+	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);
+	
+	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_dummy.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dummy.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- check_dummy.c	3 Dec 2004 00:55:27 -0000	1.10
+++ check_dummy.c	3 Dec 2004 11:45:09 -0000	1.11
@@ -41,7 +41,7 @@
 	textdomain (PACKAGE);
 
 	if (argc < 2)
-		usage (_("Incorrect number of arguments supplied\n"));
+		usage4 (_("Incorrect number of arguments supplied"));
 	else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) {
 		print_revision (progname, revision);
 		exit (STATE_OK);
@@ -51,7 +51,7 @@
 		exit (STATE_OK);
 	}
 	else if (!is_integer (argv[1]))
-		usage (_("Arguments to check_dummy must be an integer\n"));
+		usage4 (_("Arguments to check_dummy must be an integer"));
 	else
 		result = atoi (argv[1]);
 
@@ -107,5 +107,5 @@
 void
 print_usage (void)
 {
-	printf (_("Usage: %s <integer state> [optional text]\n"), progname);
+	printf ("Usage: %s <integer state> [optional text]\n", progname);
 }

Index: check_ide-smart.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ide-smart.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- check_ide-smart.c	3 Dec 2004 08:45:22 -0000	1.9
+++ check_ide-smart.c	3 Dec 2004 11:45:09 -0000	1.10
@@ -385,7 +385,7 @@
 show_help () 
 {
 	printf (_("\
-Usage: check_ide-smart [DEVICE] [OPTION]\n\
+Usage: %s [DEVICE] [OPTION]\n\
  -d, --device=DEVICE\n\
     Select device DEVICE\n\
  -i, --immediate\n\
@@ -397,9 +397,9 @@
  -0, --auto-off\n\
     Turn off automatic offline tests\n\
  -n, --net-saint\n\
-    Output suitable for Net Saint\n\
- -h, --help\n\
- -V, --version\n"));
+    Output suitable for Net Saint\n", progname);
+	
+	printf (UT_HLP_VRS, progname, progname);
 }
 
 

Index: check_mysql.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mysql.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_mysql.c	3 Dec 2004 00:55:27 -0000	1.20
+++ check_mysql.c	3 Dec 2004 11:45:09 -0000	1.21
@@ -308,8 +308,8 @@
 void
 print_usage (void)
 {
-	printf (_("\
-Usage: %s [-d database] [-H host] [-P port] [-u user] [-p password] [-S]\n"),
+	printf ("\
+Usage: %s [-d database] [-H host] [-P port] [-u user] [-p password] [-S]\n",
 	        progname);
-	printf (_(UT_HLP_VRS), progname, progname);
+	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_ldap.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ldap.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- check_ldap.c	3 Dec 2004 02:21:15 -0000	1.23
+++ check_ldap.c	3 Dec 2004 11:45:09 -0000	1.24
@@ -333,10 +333,10 @@
 void
 print_usage (void)
 {
-	printf (_("\
+	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"),
+(Note: all times are in seconds.)\n",
 	        progname,
 #ifdef HAVE_LDAP_SET_OPTION
 			" [-2|-3] [-4|-6]"
@@ -345,5 +345,5 @@
 #endif
 			);
 
-	printf (_(UT_HLP_VRS), progname, progname);
+	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_load.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_load.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- check_load.c	3 Dec 2004 00:55:27 -0000	1.21
+++ check_load.c	3 Dec 2004 11:45:09 -0000	1.22
@@ -319,7 +319,7 @@
 void
 print_usage (void)
 {
-	printf (_("Usage: %s -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15\n"),
+	printf ("Usage: %s -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15\n"),
 	        progname);
-	printf (_(UT_HLP_VRS), progname, progname);
+	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_mrtgtraf.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mrtgtraf.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- check_mrtgtraf.c	3 Dec 2004 00:55:27 -0000	1.19
+++ check_mrtgtraf.c	3 Dec 2004 11:45:09 -0000	1.20
@@ -363,8 +363,9 @@
 void
 print_usage (void)
 {
-	printf (_("\
+	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);
+	
+	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_by_ssh.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_by_ssh.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- check_by_ssh.c	3 Dec 2004 09:19:17 -0000	1.28
+++ check_by_ssh.c	3 Dec 2004 11:45:09 -0000	1.29
@@ -308,7 +308,7 @@
 		asprintf (&remotecmd, "%s;echo STATUS CODE: $?;", remotecmd);
 
 	if (remotecmd == NULL || strlen (remotecmd) <= 1)
-		usage (_("No remotecmd\n"));
+		usage4 (_("No remotecmd"));
 
 	asprintf (&comm, "%s %s '%s'", comm, hostname, remotecmd);
 
@@ -409,9 +409,10 @@
 void
 print_usage (void)
 {
-	printf (_("\n\
+	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"),
+  -C <command> [-n name] [-s servicelist] [-O outputfile] [-p port]\n",
 	        progname);
+					
 	printf (_(UT_HLP_VRS), progname, progname);
 }

Index: check_http.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- check_http.c	3 Dec 2004 09:19:18 -0000	1.71
+++ check_http.c	3 Dec 2004 11:45:09 -0000	1.72
@@ -1497,5 +1497,6 @@
   [-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);
+	
+	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_nwstat.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nwstat.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- check_nwstat.c	3 Dec 2004 09:19:18 -0000	1.22
+++ check_nwstat.c	3 Dec 2004 11:45:10 -0000	1.23
@@ -987,8 +987,9 @@
 
 void print_usage(void)
 {
-	printf (_("\
+	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);
+	
+	printf (UT_HLP_VRS, progname, progname);
 }

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

Index: check_disk.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_disk.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- check_disk.c	2 Dec 2004 16:51:24 -0000	1.51
+++ check_disk.c	3 Dec 2004 11:45:09 -0000	1.52
@@ -322,7 +322,7 @@
 				break;
 			}
 			else {
-				usage (_("Warning threshold must be integer or percentage!\n"));
+				usage4 (_("Warning threshold must be integer or percentage!"));
 			}
 		case 'c':									/* critical threshold */
 			if (is_intnonneg (optarg)) {
@@ -339,7 +339,7 @@
 				break;
 			}
 			else {
-				usage (_("Critical threshold must be integer or percentage!\n"));
+				usage4 (_("Critical threshold must be integer or percentage!"));
 			}
 		case 'u':
 			if (units)
@@ -636,10 +636,9 @@
 void
 print_usage (void)
 {
-	printf (_("\
+	printf ("\
 Usage: %s -w limit -c limit [-p path | -x device] [-t timeout] [-m] [-e]\n\
-        [-v] [-q]\n\
-       %s (-h|--help)\n\
-       %s (-V|--version)\n"),
-	        progname,  progname, progname);
+        [-v] [-q]\n", progname);
+
+	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_game.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_game.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- check_game.c	3 Dec 2004 00:55:27 -0000	1.16
+++ check_game.c	3 Dec 2004 11:45:09 -0000	1.17
@@ -333,10 +333,11 @@
 void
 print_usage (void)
 {
-	printf (_("\
+	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);
+	
+	printf (UT_HLP_VRS, progname, progname);
 }
 
 /******************************************************************************

Index: check_nagios.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nagios.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- check_nagios.c	3 Dec 2004 04:37:14 -0000	1.18
+++ check_nagios.c	3 Dec 2004 11:45:09 -0000	1.19
@@ -302,7 +302,9 @@
 void
 print_usage (void)
 {
-	printf (_("\
-Usage: %s -F <status log file> -e <expire_minutes> -C <process_string>\n"),
+	printf ("\
+Usage: %s -F <status log file> -e <expire_minutes> -C <process_string>\n",
 	        progname);
+					
+	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_fping.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_fping.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- check_fping.c	3 Dec 2004 00:55:27 -0000	1.19
+++ check_fping.c	3 Dec 2004 11:45:09 -0000	1.20
@@ -399,6 +399,6 @@
 void
 print_usage (void)
 {
-	printf (_("Usage: %s <host_address>\n"), progname);
-	printf (_(UT_HLP_VRS), progname, progname);
+	printf ("Usage: %s <host_address>\n", progname);
+	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_nt.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nt.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- check_nt.c	3 Dec 2004 00:55:27 -0000	1.30
+++ check_nt.c	3 Dec 2004 11:45:09 -0000	1.31
@@ -607,7 +607,7 @@
 
 void print_help(void)
 {
-	print_revision(progname,"$Revision$");
+	print_revision(progname,revision);
 	printf (_("\
 Copyright (c) 2000 Yves Rubin (rubiyz at yahoo.com)\n\n\
 This plugin collects data from the NSClient service running on a\n\
@@ -682,8 +682,9 @@
 
 void print_usage(void)
 {
-	printf(_("\
+	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);
+	
+	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_dig.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dig.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- check_dig.c	3 Dec 2004 09:19:17 -0000	1.33
+++ check_dig.c	3 Dec 2004 11:45:09 -0000	1.34
@@ -353,11 +353,10 @@
 void
 print_usage (void)
 {
-	printf (_("\
+	printf ("\
 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 ("       %s (-h|--help)\n", progname);
-	printf ("       %s (-V|--version)\n", progname);
+         [-a <expected answer address>] [-v]\n", progname);
+				 
+	printf (UT_HLP_VRS, progname, progname);
 }

Index: check_dns.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- check_dns.c	3 Dec 2004 00:55:27 -0000	1.36
+++ check_dns.c	3 Dec 2004 11:45:09 -0000	1.37
@@ -425,8 +425,8 @@
 void
 print_usage (void)
 {
-	printf (_("\
-Usage: %s -H host [-s server] [-a expected-address] [-A] [-t timeout]\n\
-       %s --help\n\
-       %s --version\n"), progname, progname, progname);
+	printf ("\
+Usage: %s -H host [-s server] [-a expected-address] [-A] [-t timeout]\n", progname);
+
+	printf (UT_HLP_VRS, progname, progname);
 }