[nagiosplug] Standardize the extra-opts notes
"Thomas Guyot-Sionnest" <[email protected]>
| Newsgroups | gmane.network.nagios.plugins.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module: nagiosplug Branch: master Commit: 884aee06674755ef44e4042803ae84a0faac5b10 Author: Thomas Guyot-Sionnest <[email protected]> Date: Wed Apr 21 23:29:18 2010 -0400 URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=884aee0 Standardize the extra-opts notes --- plugins-root/check_dhcp.c | 6 ------ plugins-root/check_icmp.c | 4 ---- plugins/check_apt.c | 6 ------ plugins/check_by_ssh.c | 6 ------ plugins/check_cluster.c | 4 ---- plugins/check_dig.c | 6 ------ plugins/check_disk.c | 6 ------ plugins/check_dns.c | 6 ------ plugins/check_fping.c | 6 ------ plugins/check_game.c | 4 ---- plugins/check_hpjd.c | 6 ------ plugins/check_http.c | 2 -- plugins/check_ide_smart.c | 6 ------ plugins/check_ldap.c | 4 ---- plugins/check_load.c | 6 ------ plugins/check_mrtg.c | 3 --- plugins/check_mrtgtraf.c | 3 --- plugins/check_mysql.c | 4 ---- plugins/check_mysql_query.c | 4 ---- plugins/check_nagios.c | 6 ------ plugins/check_nt.c | 3 --- plugins/check_ntp.c | 4 ---- plugins/check_ntp_peer.c | 4 ---- plugins/check_ntp_time.c | 4 ---- plugins/check_nwstat.c | 3 --- plugins/check_overcr.c | 4 ---- plugins/check_pgsql.c | 6 ------ plugins/check_ping.c | 6 ------ plugins/check_procs.c | 6 ------ plugins/check_radius.c | 6 ------ plugins/check_real.c | 6 ------ plugins/check_smtp.c | 6 ------ plugins/check_snmp.c | 3 --- plugins/check_ssh.c | 6 ------ plugins/check_swap.c | 5 ----- plugins/check_tcp.c | 6 ------ plugins/check_time.c | 6 ------ plugins/check_ups.c | 4 ---- plugins/check_users.c | 6 ------ plugins/utils.h | 5 +---- 40 files changed, 1 insertions(+), 196 deletions(-) diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c index 51ac96e..ba35197 100644 --- a/plugins-root/check_dhcp.c +++ b/plugins-root/check_dhcp.c @@ -1410,12 +1410,6 @@ void print_help(void){ printf (" %s\n", "-u, --unicast"); printf (" %s\n", _("Unicast testing: mimic a DHCP relay, requires -s")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); return; } diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c index 590bb1a..5f0224d 100644 --- a/plugins-root/check_icmp.c +++ b/plugins-root/check_icmp.c @@ -1335,10 +1335,6 @@ print_help(void) /* printf ("%s\n", _("Long options are currently unsupported.")); printf ("%s\n", _("Options marked with * require an argument")); */ -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf (UT_EXTRA_OPTS_NOTES); -#endif printf (UT_SUPPORT); } diff --git a/plugins/check_apt.c b/plugins/check_apt.c index 7276f03..1480494 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c @@ -453,12 +453,6 @@ print_help (void) printf (" %s\n", _("timeout (with -t) to prevent the plugin from timing out if apt-get")); printf (" %s\n", _("upgrade is expected to take longer than the default timeout.")); -#ifdef NP_EXTRA_OPTS - printf("\n"); - printf("%s\n", _("Notes:")); - printf(UT_EXTRA_OPTS_NOTES); -#endif - printf(UT_SUPPORT); } diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c index b688d43..a569c19 100644 --- a/plugins/check_by_ssh.c +++ b/plugins/check_by_ssh.c @@ -442,12 +442,6 @@ print_help (void) printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c2;0; up 2 days"); printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days"); -#ifdef NP_EXTRA_OPTS - printf("\n"); - printf("%s\n", _("Notes:")); - printf(UT_EXTRA_OPTS_NOTES); -#endif - printf(UT_SUPPORT); } diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c index f232227..8c209f9 100644 --- a/plugins/check_cluster.c +++ b/plugins/check_cluster.c @@ -256,10 +256,6 @@ print_help(void) printf("\n"); printf("%s\n", _("Notes:")); printf(UT_THRESHOLDS_NOTES); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf (UT_EXTRA_OPTS_NOTES); -#endif printf ("\n"); printf ("%s\n", _("Examples:")); diff --git a/plugins/check_dig.c b/plugins/check_dig.c index 45189b0..6f4d8e7 100644 --- a/plugins/check_dig.c +++ b/plugins/check_dig.c @@ -343,12 +343,6 @@ print_help (void) printf (" %s\n", "check_dig -H DNSSERVER -l www.example.com -A \"+tcp\""); printf (" %s\n", "This will send a tcp query to DNSSERVER for www.example.com"); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 633aa5f..f2ed983 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -959,12 +959,6 @@ print_help (void) printf (" %s\n", "-X, --exclude-type=TYPE"); printf (" %s\n", _("Ignore all filesystems of indicated type (may be repeated)")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf ("\n"); printf ("%s\n", _("Examples:")); printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /"); diff --git a/plugins/check_dns.c b/plugins/check_dns.c index a921429..4316712 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c @@ -476,12 +476,6 @@ print_help (void) printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_fping.c b/plugins/check_fping.c index 4e6533f..d2c945d 100644 --- a/plugins/check_fping.c +++ b/plugins/check_fping.c @@ -422,12 +422,6 @@ print_help (void) printf (" %s\n", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of")); printf (" %s\n", _("packet loss to trigger an alarm state.")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_game.c b/plugins/check_game.c index bcde103..815c72d 100644 --- a/plugins/check_game.c +++ b/plugins/check_game.c @@ -319,10 +319,6 @@ print_help (void) printf (" %s\n", _("This plugin uses the 'qstat' command, the popular game server status query tool.")); printf (" %s\n", _("If you don't have the package installed, you will need to download it from")); printf (" %s\n", _("http://www.activesw.com/people/steve/qstat.html before you can use this plugin.")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf (UT_EXTRA_OPTS_NOTES); -#endif printf (UT_SUPPORT); } diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c index e4e8e6e..97411d1 100644 --- a/plugins/check_hpjd.c +++ b/plugins/check_hpjd.c @@ -403,12 +403,6 @@ print_help (void) printf (_("(default=%s)"), DEFAULT_COMMUNITY); printf ("\n"); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_http.c b/plugins/check_http.c index 6c53f7a..a21669c 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -1400,8 +1400,6 @@ print_help (void) printf (" %s\n", _("messages from the host result in STATE_WARNING return values. If you are")); printf (" %s\n", _("checking a virtual server that uses 'host headers' you must supply the FQDN")); printf (" %s\n", _("(fully qualified domain name) as the [host_name] argument.")); - printf ("\n"); - printf (UT_EXTRA_OPTS_NOTES); #ifdef HAVE_SSL printf ("\n"); diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c index 3811dc1..b051739 100644 --- a/plugins/check_ide_smart.c +++ b/plugins/check_ide_smart.c @@ -506,12 +506,6 @@ print_help (void) printf (" %s\n", "-n, --nagios"); printf (" %s\n", _("Output suitable for Nagios")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index 66834e8..11644a1 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c @@ -437,10 +437,6 @@ print_help (void) printf (" %s\n", _("'SSL on connect' will be used no matter how the plugin was called.")); printf (" %s\n", _("This detection is deprecated, please use 'check_ldap' with the '--starttls' or '--ssl' flags")); printf (" %s\n", _("to define the behaviour explicitly instead.")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf (UT_EXTRA_OPTS_NOTES); -#endif printf (UT_SUPPORT); } diff --git a/plugins/check_load.c b/plugins/check_load.c index 450a4fc..99e2a15 100644 --- a/plugins/check_load.c +++ b/plugins/check_load.c @@ -316,12 +316,6 @@ print_help (void) printf (" %s\n", "-r, --percpu"); printf (" %s\n", _("Divide the load averages by the number of CPUs (when possible)")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c index 6736c11..07013ee 100644 --- a/plugins/check_mrtg.c +++ b/plugins/check_mrtg.c @@ -367,9 +367,6 @@ print_help (void) printf (" %s\n", _("you can always hack the code to make this plugin work for you...")); printf (" %s\n", _("- MRTG stands for the Multi Router Traffic Grapher. It can be downloaded from")); printf (" %s\n", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html"); -#ifdef NP_EXTRA_OPTS - printf (" -%s", UT_EXTRA_OPTS_NOTES); -#endif printf (UT_SUPPORT); } diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c index 1234bff..4fd9bc0 100644 --- a/plugins/check_mrtgtraf.c +++ b/plugins/check_mrtgtraf.c @@ -366,9 +366,6 @@ print_help (void) printf (" %s\n", _("- The calculated i/o rates are a little off from what MRTG actually")); printf (" %s\n", _(" reports. I'm not sure why this is right now, but will look into it")); printf (" %s\n", _(" for future enhancements of this plugin.")); -#ifdef NP_EXTRA_OPTS - printf (" -%s", UT_EXTRA_OPTS_NOTES); -#endif printf (UT_SUPPORT); } diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c index ce19062..b3caf4b 100644 --- a/plugins/check_mysql.c +++ b/plugins/check_mysql.c @@ -410,14 +410,10 @@ print_help (void) printf (" %s\n", _("using the default unix socket. You can force TCP on localhost by using an")); printf (" %s\n", _("IP address or FQDN ('localhost' will use the socket as well).")); -#ifdef NP_EXTRA_OPTS printf ("\n"); printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); - printf ("\n"); printf (" %s\n", _("You must specify -p with an empty string to force an empty password,")); printf (" %s\n", _("overriding any my.cnf settings.")); -#endif printf (UT_SUPPORT); } diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c index 40adf09..cae4718 100644 --- a/plugins/check_mysql_query.c +++ b/plugins/check_mysql_query.c @@ -310,14 +310,10 @@ print_help (void) printf (" %s\n", _("A query is required. The result from the query should be numeric.")); printf (" %s\n", _("For extra security, create a user with minimal access.")); -#ifdef NP_EXTRA_OPTS printf ("\n"); printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); - printf ("\n"); printf (" %s\n", _("You must specify -p with an empty string to force an empty password,")); printf (" %s\n", _("overriding any my.cnf settings.")); -#endif printf (UT_SUPPORT); } diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c index 24ddadd..1a80916 100644 --- a/plugins/check_nagios.c +++ b/plugins/check_nagios.c @@ -298,12 +298,6 @@ print_help (void) printf (" %s\n", _("Substring to search for in process arguments")); printf (UT_VERBOSE); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf ("\n"); printf ("%s\n", _("Examples:")); printf (" %s\n", "check_nagios -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios"); diff --git a/plugins/check_nt.c b/plugins/check_nt.c index c877f9c..e4d64e8 100644 --- a/plugins/check_nt.c +++ b/plugins/check_nt.c @@ -748,9 +748,6 @@ void print_help(void) printf (" %s\n", _("output when this happens contains \"Cannot map xxxxx to protocol number\".")); printf (" %s\n", _("One fix for this is to change the port to something else on check_nt ")); printf (" %s\n", _("and on the client service it\'s connecting to.")); -#ifdef NP_EXTRA_OPTS - printf (" -%s", UT_EXTRA_OPTS_NOTES); -#endif printf (UT_SUPPORT); } diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index 35fddec..e752bd9 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c @@ -859,10 +859,6 @@ void print_help(void){ printf("\n"); printf("%s\n", _("Notes:")); printf(UT_THRESHOLDS_NOTES); -#ifdef NP_EXTRA_OPTS - printf("\n"); - printf(UT_EXTRA_OPTS_NOTES); -#endif printf("\n"); printf("%s\n", _("Examples:")); diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c index fa18cfb..abe91a5 100644 --- a/plugins/check_ntp_peer.c +++ b/plugins/check_ntp_peer.c @@ -693,10 +693,6 @@ void print_help(void){ printf(" %s\n", _("server; please use check_ntp_time for that purpose.")); printf("\n"); printf(UT_THRESHOLDS_NOTES); -#ifdef NP_EXTRA_OPTS - printf("\n"); - printf(UT_EXTRA_OPTS_NOTES); -#endif printf("\n"); printf("%s\n", _("Examples:")); diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c index cd412fe..1ea3e89 100644 --- a/plugins/check_ntp_time.c +++ b/plugins/check_ntp_time.c @@ -623,10 +623,6 @@ void print_help(void){ printf(" %s\n", _("check_ntp_peer.")); printf("\n"); printf(UT_THRESHOLDS_NOTES); -#ifdef NP_EXTRA_OPTS - printf("\n"); - printf(UT_EXTRA_OPTS_NOTES); -#endif printf("\n"); printf("%s\n", _("Examples:")); diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c index 2c3369a..6e09286 100644 --- a/plugins/check_nwstat.c +++ b/plugins/check_nwstat.c @@ -1674,9 +1674,6 @@ void print_help(void) printf (" %s\n", _("- Values for critical thresholds should be lower than warning thresholds")); printf (" %s\n", _(" when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, ")); printf (" %s\n", _(" TCB, LRUS and LRUM.")); -#ifdef NP_EXTRA_OPTS - printf (" -%s", UT_EXTRA_OPTS_NOTES); -#endif printf (UT_SUPPORT); } diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c index 5751dc0..606799f 100644 --- a/plugins/check_overcr.c +++ b/plugins/check_overcr.c @@ -456,10 +456,6 @@ print_help (void) printf ("%s\n", _("Notes:")); printf (" %s\n", _("For the available options, the critical threshold value should always be")); printf (" %s\n", _("higher than the warning threshold value, EXCEPT with the uptime variable")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf (UT_EXTRA_OPTS_NOTES); -#endif printf (UT_SUPPORT); } diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c index a365214..06e1127 100644 --- a/plugins/check_pgsql.c +++ b/plugins/check_pgsql.c @@ -466,12 +466,6 @@ print_help (void) printf (" %s\n", _("able to connect to the database without a password. The plugin can also send")); printf (" %s\n", _("a password, but no effort is made to obsure or encrypt the password.")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_ping.c b/plugins/check_ping.c index 45108af..db8e623 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c @@ -592,12 +592,6 @@ print_help (void) printf ("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in")); printf ("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_procs.c b/plugins/check_procs.c index e9372ff..8655f6a 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c @@ -739,12 +739,6 @@ the specified threshold ranges. The process count can be filtered by\n\ process owner, parent process PID, current state (e.g., 'Z'), or may\n\ be the total number of running processes\n\n")); -#ifdef NP_EXTRA_OPTS - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); - printf ("\n"); -#endif - printf ("%s\n", _("Examples:")); printf (" %s\n", "check_procs -w 2:2 -c 2:1024 -C portsentry"); printf (" %s\n", _("Warning if not two processes with command name portsentry.")); diff --git a/plugins/check_radius.c b/plugins/check_radius.c index c95fbe1..d5907dd 100644 --- a/plugins/check_radius.c +++ b/plugins/check_radius.c @@ -374,12 +374,6 @@ print_help (void) printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that")); printf ("%s\n", _("the password used does not allow access to sensitive system resources.")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_real.c b/plugins/check_real.c index 1643347..1f8ae42 100644 --- a/plugins/check_real.c +++ b/plugins/check_real.c @@ -440,12 +440,6 @@ print_help (void) printf ("%s\n", _("but incorrect reponse messages from the host result in STATE_WARNING return")); printf ("%s\n", _("values.")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index c78b709..6707ec5 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c @@ -808,12 +808,6 @@ print_help (void) printf ("%s\n", _("connects, but incorrect reponse messages from the host result in")); printf ("%s\n", _("STATE_WARNING return values.")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 6a44bc8..3f0deb7 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c @@ -944,9 +944,6 @@ print_help (void) printf (" %s\n", _("- Note that only one string and one regex may be checked at present")); printf (" %s\n", _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value")); printf (" %s\n", _("returned from the SNMP query is an unsigned integer.")); -#ifdef NP_EXTRA_OPTS - printf (" -%s", UT_EXTRA_OPTS_NOTES); -#endif printf (UT_SUPPORT); } diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c index 9a19343..b9b8a2d 100644 --- a/plugins/check_ssh.c +++ b/plugins/check_ssh.c @@ -291,12 +291,6 @@ print_help (void) printf (UT_VERBOSE); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_swap.c b/plugins/check_swap.c index a1356cf..c5682d7 100644 --- a/plugins/check_swap.c +++ b/plugins/check_swap.c @@ -546,11 +546,6 @@ print_help (void) printf ("\n"); printf ("%s\n", _("Notes:")); printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index 156765e..555b8b9 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -641,12 +641,6 @@ print_help (void) printf (UT_VERBOSE); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_time.c b/plugins/check_time.c index 7816b23..9e81d9e 100644 --- a/plugins/check_time.c +++ b/plugins/check_time.c @@ -360,12 +360,6 @@ print_help (void) printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/check_ups.c b/plugins/check_ups.c index ce57ef3..aef8e11 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -649,10 +649,6 @@ print_help (void) printf (" %s\n", _("Network UPS Tools be installed on the remote host. If you do not have the")); printf (" %s\n", _("package installed on your system, you can download it from")); printf (" %s\n", _("http://www.networkupstools.org")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf (UT_EXTRA_OPTS_NOTES); -#endif printf (UT_SUPPORT); } diff --git a/plugins/check_users.c b/plugins/check_users.c index dc661d8..061c2fe 100644 --- a/plugins/check_users.c +++ b/plugins/check_users.c @@ -219,12 +219,6 @@ print_help (void) printf (" %s\n", "-c, --critical=INTEGER"); printf (" %s\n", _("Set CRITICAL status if more than INTEGER users are logged in")); -#ifdef NP_EXTRA_OPTS - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (UT_EXTRA_OPTS_NOTES); -#endif - printf (UT_SUPPORT); } diff --git a/plugins/utils.h b/plugins/utils.h index 8da2160..812f588 100644 --- a/plugins/utils.h +++ b/plugins/utils.h @@ -183,12 +183,9 @@ char *fperfdata (const char *, #ifdef NP_EXTRA_OPTS #define UT_EXTRA_OPTS _("\ --extra-opts=[section][@file]\n\ - Read additionnal options from ini file\n") -#define UT_EXTRA_OPTS_NOTES _("\ - See: http://nagiosplugins.org/extra-opts for --extra-opts usage and examples.\n") + Read options from an ini file. See http://nagiosplugins.org/extra-opts for usage\n") #else #define UT_EXTRA_OPTS "" -#define UT_EXTRA_OPTS_NOTES "" #endif #define UT_THRESHOLDS_NOTES _("\ ------------------------------------------------------------------------------