usbhidctl(1): Raise WARNS to 6 and fix warnings.

diff --git a/usr.bin/usbhidctl/Makefile b/usr.bin/usbhidctl/Makefile
index 412c42e..4a82c1c 100644 (file)
--- a/usr.bin/usbhidctl/Makefile
+++ b/usr.bin/usbhidctl/Makefile
@@ -1,12 +1,10 @@
 #      $NetBSD: Makefile,v 1.4 1999/05/11 21:02:25 augustss Exp $
 #      $FreeBSD: src/usr.bin/usbhidctl/Makefile,v 1.2.2.1 2002/04/03 16:48:25 joe Exp $
-#      $DragonFly: src/usr.bin/usbhidctl/Makefile,v 1.4 2007/08/27 16:51:00 pavalos Exp $
 
 .include <bsd.own.mk>
 
 PROG=  usbhidctl
 SRCS=  usbhid.c
-WARNS?=        1
 
 LDADD+=        -lusbhid
 DPADD+=        ${LIBUSBHID}

diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c
index 56a5968..8d79708 100644 (file)
--- a/usr.bin/usbhidctl/usbhid.c
+++ b/usr.bin/usbhidctl/usbhid.c
@@ -1,6 +1,5 @@
 /* $NetBSD: usbhid.c,v 1.14 2000/07/03 02:51:37 matt Exp $ */
 /* $FreeBSD: src/usr.bin/usbhidctl/usbhid.c,v 1.12 2007/12/21 03:40:36 imp Exp $ */
-/* $DragonFly: src/usr.bin/usbhidctl/usbhid.c,v 1.4 2008/11/24 17:15:17 hasso Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -94,16 +93,14 @@ prbits(int bits, char **strs, int n)
 void
 usage(void)
 {
-       extern char *__progname;
-
        fprintf(stderr,
                 "usage: %s -f device "
                 "[-l] [-n] [-r] [-t tablefile] [-v] [-x] name ...\n",
-                __progname);
+                getprogname());
        fprintf(stderr,
                 "       %s -f device "
                 "[-l] [-n] [-r] [-t tablefile] [-v] [-x] -a\n",
-                __progname);
+                getprogname());
        exit(1);
 }