tools/distclean: use git-clean when possible

[nagiosplug.git] / plugins-root / check_dhcp.c

diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 35874a93b61455ff53c012d6628911b018316fa7..2a1875c405431048c3099a5ec8834ffd72599dcd 100644 (file)
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -6,8 +6,6 @@
 * Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)
 * Copyright (c) 2001-2007 Nagios Plugin Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_dhcp plugin
@@ -32,12 +30,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_dhcp";
-const char *revision = "$Revision$";
 const char *copyright = "2001-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -1168,7 +1164,7 @@ int call_getopt(int argc, char **argv){
                        break;
 
                case 'V': /* version */
-                       print_revision(progname,revision);
+                       print_revision(progname, NP_VERSION);
                        exit(STATE_OK);
 
                case 'h': /* help */
@@ -1385,7 +1381,7 @@ void print_hardware_address(const unsigned char *address){
 /* print usage help */
 void print_help(void){
 
-       print_revision(progname,revision);
+       print_revision(progname, NP_VERSION);
 
        printf("Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)\n");
        printf (COPYRIGHT, copyright, email);
@@ -1396,10 +1392,10 @@ void print_help(void){
 
        print_usage();
 
-       printf (_(UT_HELP_VRSN));
-       printf (_(UT_EXTRA_OPTS));
+       printf (UT_HELP_VRSN);
+       printf (UT_EXTRA_OPTS);
 
-       printf (_(UT_VERBOSE));
+       printf (UT_VERBOSE);
 
        printf (" %s\n", "-s, --serverip=IPADDRESS");
   printf ("    %s\n", _("IP address of DHCP server that we must hear from"));
@@ -1414,13 +1410,7 @@ 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));
+  printf (UT_SUPPORT);
        return;
        }
 
@@ -1428,7 +1418,7 @@ void print_help(void){
 void
 print_usage(void){
 
-  printf (_("Usage:"));
+  printf ("%s\n", _("Usage:"));
   printf (" %s [-v] [-u] [-s serverip] [-r requestedip] [-t timeout]\n",progname);
   printf ("                  [-i interface] [-m mac]\n");