From edf60f6dceba48555f2534d9a217a8c5913ce029 Mon Sep 17 00:00:00 2001 From: Benoit Mortier Date: Fri, 3 Dec 2004 20:28:53 +0000 Subject: [PATCH] remove UT_HLP_VRS from print_usage this was not a good idea ;-) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@994 f882894a-f735-0410-b71e-b25c423dba1c --- plugins/check_by_ssh.c | 7 ++----- plugins/check_dig.c | 2 -- plugins/check_disk.c | 4 +--- plugins/check_dns.c | 2 -- plugins/check_dummy.c | 2 +- plugins/check_fping.c | 1 - plugins/check_game.c | 5 +---- plugins/check_hpjd.c | 2 -- plugins/check_http.c | 14 ++++++-------- plugins/check_ide-smart.c | 2 -- plugins/check_ldap.c | 7 ++----- plugins/check_load.c | 2 -- plugins/check_mrtg.c | 8 +------- plugins/check_mrtgtraf.c | 5 +---- plugins/check_mysql.c | 1 - plugins/check_nagios.c | 5 +---- plugins/check_nt.c | 4 +--- plugins/check_nwstat.c | 4 +--- plugins/check_overcr.c | 22 ++++++++++------------ plugins/check_pgsql.c | 4 +--- plugins/check_ping.c | 4 +--- plugins/check_procs.c | 6 ++---- plugins/check_radius.c | 3 +-- plugins/check_real.c | 4 +--- plugins/check_smtp.c | 3 +-- plugins/check_snmp.c | 12 +++++------- plugins/check_ssh.c | 2 -- plugins/check_swap.c | 2 -- plugins/check_tcp.c | 10 ++++------ plugins/check_time.c | 4 +--- plugins/check_udp.c | 4 +--- plugins/check_ups.c | 4 +--- plugins/check_users.c | 2 -- plugins/negate.c | 10 +++------- plugins/urlize.c | 2 -- 35 files changed, 50 insertions(+), 125 deletions(-) diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c index 7080c69..cc2ec75 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 \n\ - -C [-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 -C \n\ + [-n name] [-s servicelist] [-O outputfile] [-p port]\n", progname); } diff --git a/plugins/check_dig.c b/plugins/check_dig.c index 823ea01..5bed80d 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 ] [-T ]\n\ [-w ] [-c ] [-t ]\n\ [-a ] [-v]\n", progname); - - printf (UT_HLP_VRS, progname, progname); } diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 70cd548..109420a 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 579c51a..492fa17 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 c621b9f..e0c38d3 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 3baf52f..0b23f79 100644 --- a/plugins/check_fping.c +++ b/plugins/check_fping.c @@ -400,5 +400,4 @@ void print_usage (void) { printf ("Usage: %s \n", progname); - printf (UT_HLP_VRS, progname, progname); } diff --git a/plugins/check_game.c b/plugins/check_game.c index a194ab2..9b13d94 100644 --- a/plugins/check_game.c +++ b/plugins/check_game.c @@ -329,15 +329,12 @@ Notes:\n\ - void print_usage (void) { printf ("\ Usage: %s [-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 b9b3f7f..816ce19 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 125052f..f334026 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -1491,12 +1491,10 @@ void print_usage (void) { printf (_("\ -Usage: %s (-H | -I ) [-u ] [-p ]\n\ - [-w ] [-c ] [-t ] [-L]\n\ - [-a auth] [-f ] [-e ]\n\ - [-s string] [-l] [-r | -R ]\n\ - [-P string] [-m min_pg_size] [-4|-6] [-N] [-M ] [-A string]\n\ - [-k string]\n"), progname); - - printf (UT_HLP_VRS, progname, progname); +Usage: %s -H | -I ) [-u ] [-p ]\n\ + [-w ] [-c ] [-t ] [-L]\n\ + [-a auth] [-f ] [-e ]\n\ + [-s string] [-l] [-r | -R ]\n\ + [-P string] [-m min_pg_size] [-4|-6] [-N] [-M ] [-A string]\n\ + [-k string]\n"), progname); } diff --git a/plugins/check_ide-smart.c b/plugins/check_ide-smart.c index aa74f98..9ebef6c 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 80c0907..9664c0f 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 -b [-p ] [-a ] [-D ]\n\ - [-P ] [-w ] [-c ] [-t timeout]%s\n\ -(Note: all times are in seconds.)\n", + [-P ] [-w ] [-c ] [-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 -b [-p ] [-a ] [-D ]\n\ "" #endif ); - - printf (UT_HLP_VRS, progname, progname); } diff --git a/plugins/check_load.c b/plugins/check_load.c index 2112d1c..d9833b6 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 cc4714c..5dfee72 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: