From 688862d043576d3fa7e39a3810e1a8627bf84626 Mon Sep 17 00:00:00 2001
From: Chris Pressey <cpressey@dragonflybsd.org>
Date: Fri, 4 Mar 2005 00:11:11 +0000
Subject: [PATCH] Reduce warnings as part of WARNS=6 cleaning, stage 2/6 (or
 so):

- Mark many callback function arguments as __unused.

Submitted-by: Sepherosa Ziehau <sepherosa_at_softhome_dot_net>
---
 sbin/ifconfig/ifconfig.c    | 51 +++++++++++++++++++++----------------
 sbin/ifconfig/ifieee80211.c | 38 +++++++++++++++++----------
 sbin/ifconfig/ifmedia.c     | 11 +++++---
 sbin/ifconfig/ifvlan.c      | 11 +++++---
 4 files changed, 68 insertions(+), 43 deletions(-)

diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index ffb18ffc3e..75e91c85cd 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)ifconfig.c	8.2 (Berkeley) 2/16/94
  * $FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.96 2004/02/27 06:43:14 kan Exp $
- * $DragonFly: src/sbin/ifconfig/ifconfig.c,v 1.14 2005/03/03 23:52:00 cpressey Exp $
+ * $DragonFly: src/sbin/ifconfig/ifconfig.c,v 1.15 2005/03/04 00:11:11 cpressey Exp $
  */
 
 #include <sys/param.h>
@@ -761,7 +761,8 @@ ifconfig(int argc, char *const *argv, const struct afswtch *afp)
 
 /*ARGSUSED*/
 void
-setifaddr(const char *addr, int param, int s, const struct afswtch *afp)
+setifaddr(const char *addr, int param __unused, int s __unused,
+	  const struct afswtch *afp)
 {
 	if (*afp->af_getaddr == NULL)
 		return;
@@ -838,7 +839,8 @@ settunnel(const char *src, const char *dst, int s, const struct afswtch *afp)
 
 /* ARGSUSED */
 void
-deletetunnel(const char *vname, int param, int s, const struct afswtch *afp)
+deletetunnel(const char *vname __unused, int param __unused, int s,
+	     const struct afswtch *afp __unused)
 {
 
 	if (ioctl(s, SIOCDIFPHYADDR, &ifr) < 0)
@@ -846,7 +848,7 @@ deletetunnel(const char *vname, int param, int s, const struct afswtch *afp)
 }
 
 void
-setifnetmask(const char *addr, int dummy __unused, int s,
+setifnetmask(const char *addr, int dummy __unused, int s __unused,
              const struct afswtch *afp)
 {
 	if (*afp->af_getaddr == NULL)
@@ -857,7 +859,7 @@ setifnetmask(const char *addr, int dummy __unused, int s,
 
 #ifdef INET6
 void
-setifprefixlen(const char *addr, int dummy __unused, int s,
+setifprefixlen(const char *addr, int dummy __unused, int s __unused,
                const struct afswtch *afp)
 {
         if (*afp->af_getprefix)
@@ -893,7 +895,7 @@ setip6vltime(const char *seconds, int dummy __unused, int s,
 }
 
 void
-setip6lifetime(const char *cmd, const char *val, int s,
+setip6lifetime(const char *cmd, const char *val, int s __unused,
                const struct afswtch *afp)
 {
 	time_t newval, t;
@@ -915,7 +917,7 @@ setip6lifetime(const char *cmd, const char *val, int s,
 }
 
 void
-setip6eui64(const char *cmd, int dummy __unused, int s,
+setip6eui64(const char *cmd, int dummy __unused, int s __unused,
             const struct afswtch *afp)
 {
 	struct ifaddrs *ifap, *ifa;
@@ -950,7 +952,7 @@ setip6eui64(const char *cmd, int dummy __unused, int s,
 #endif
 
 void
-setifbroadaddr(const char *addr, int dummy __unused, int s,
+setifbroadaddr(const char *addr, int dummy __unused, int s __unused,
                const struct afswtch *afp)
 {
 	if (*afp->af_getaddr == NULL)
@@ -959,8 +961,8 @@ setifbroadaddr(const char *addr, int dummy __unused, int s,
 }
 
 void
-setifipdst(const char *addr, int dummy __unused, int s,
-           const struct afswtch *afp)
+setifipdst(const char *addr, int dummy __unused, int s __unused,
+           const struct afswtch *afp __unused)
 {
 	in_getaddr(addr, DSTADDR);
 	setipdst++;
@@ -970,7 +972,8 @@ setifipdst(const char *addr, int dummy __unused, int s,
 #define rqtosa(x) (&(((struct ifreq *)(afp->x))->ifr_addr))
 
 void
-notealias(const char *addr, int param, int s, const struct afswtch *afp)
+notealias(const char *addr __unused, int param, int s __unused,
+	  const struct afswtch *afp)
 {
 	if (setaddr && doalias == 0 && param < 0)
 		bcopy((caddr_t)rqtosa(af_addreq),
@@ -986,7 +989,7 @@ notealias(const char *addr, int param, int s, const struct afswtch *afp)
 
 /*ARGSUSED*/
 void
-setifdstaddr(const char *addr, int param __unused, int s,
+setifdstaddr(const char *addr, int param __unused, int s __unused,
              const struct afswtch *afp)
 {
 	if (*afp->af_getaddr == NULL)
@@ -1000,7 +1003,8 @@ setifdstaddr(const char *addr, int param __unused, int s,
  * Make a private copy so we can avoid that.
  */
 void
-setifflags(const char *vname, int value, int s, const struct afswtch *afp)
+setifflags(const char *vname, int value, int s,
+	   const struct afswtch *afp __unused)
 {
 	struct ifreq		my_ifr;
 
@@ -1025,7 +1029,8 @@ setifflags(const char *vname, int value, int s, const struct afswtch *afp)
 }
 
 void
-setifcap(const char *vname, int value, int s, const struct afswtch *afp)
+setifcap(const char *vname, int value, int s,
+	 const struct afswtch *afp __unused)
 {
 
  	if (ioctl(s, SIOCGIFCAP, (caddr_t)&ifr) < 0) {
@@ -1045,7 +1050,7 @@ setifcap(const char *vname, int value, int s, const struct afswtch *afp)
 
 void
 setifmetric(const char *val, int dummy __unused, int s,
-            const struct afswtch *afp)
+            const struct afswtch *afp __unused)
 {
 	strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name));
 	ifr.ifr_metric = atoi(val);
@@ -1054,7 +1059,8 @@ setifmetric(const char *val, int dummy __unused, int s,
 }
 
 void
-setifmtu(const char *val, int dummy __unused, int s, const struct afswtch *afp)
+setifmtu(const char *val, int dummy __unused, int s,
+	 const struct afswtch *afp __unused)
 {
 	strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name));
 	ifr.ifr_mtu = atoi(val);
@@ -1064,7 +1070,7 @@ setifmtu(const char *val, int dummy __unused, int s, const struct afswtch *afp)
 
 void
 setifname(const char *val, int dummy __unused, int s, 
-    const struct afswtch *afp)
+	  const struct afswtch *afp __unused)
 {
 	char	*newname;
 
@@ -1752,8 +1758,8 @@ link_getaddr(const char *addr, int which)
 
 /* XXX  FIXME -- should use strtoul for better parsing. */
 void
-setatrange(const char *range, int dummy __unused, int s,
-           const struct afswtch *afp)
+setatrange(const char *range, int dummy __unused, int s __unused,
+           const struct afswtch *afp __unused)
 {
 	u_short	first = 123, last = 123;
 
@@ -1766,8 +1772,8 @@ setatrange(const char *range, int dummy __unused, int s,
 }
 
 void
-setatphase(const char *phase, int dummy __unused, int s,
-           const struct afswtch *afp)
+setatphase(const char *phase, int dummy __unused, int s __unused,
+           const struct afswtch *afp __unused)
 {
 	if (!strcmp(phase, "1"))
 		at_nr.nr_phase = 1;
@@ -1985,7 +1991,8 @@ clone_create(void)
 }
 
 void
-clone_destroy(const char *val, int d, int s, const struct afswtch *rafp)
+clone_destroy(const char *val __unused, int d __unused, int s,
+	      const struct afswtch *rafp __unused)
 {
 
 	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index 521b4d633f..ec1be43f14 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.1.2.3 2002/02/07 15:12:37 ambrisko Exp $
- * $DragonFly: src/sbin/ifconfig/ifieee80211.c,v 1.6 2004/12/18 21:43:38 swildner Exp $
+ * $DragonFly: src/sbin/ifconfig/ifieee80211.c,v 1.7 2005/03/04 00:11:11 cpressey Exp $
  */
 
 /*-
@@ -94,7 +94,8 @@ static const char *get_string(const char *val, const char *sep,
 static void print_string(const u_int8_t *buf, int len);
 
 void
-set80211ssid(const char *val, int d, int s, const struct afswtch *rafp)
+set80211ssid(const char *val, int d __unused, int s,
+	     const struct afswtch *rafp __unused)
 {
 	int		ssid;
 	int		len;
@@ -115,7 +116,8 @@ set80211ssid(const char *val, int d, int s, const struct afswtch *rafp)
 }
 
 void
-set80211stationname(const char *val, int d, int s, const struct afswtch *rafp)
+set80211stationname(const char *val, int d __unused, int s,
+		    const struct afswtch *rafp __unused)
 {
 	int			len;
 	u_int8_t		data[33];
@@ -128,13 +130,15 @@ set80211stationname(const char *val, int d, int s, const struct afswtch *rafp)
 }
 
 void
-set80211channel(const char *val, int d, int s, const struct afswtch *rafp)
+set80211channel(const char *val, int d __unused, int s,
+		const struct afswtch *rafp __unused)
 {
 	set80211(s, IEEE80211_IOC_CHANNEL, atoi(val), 0, NULL);
 }
 
 void
-set80211authmode(const char *val, int d, int s, const struct afswtch *rafp)
+set80211authmode(const char *val, int d __unused, int s,
+		 const struct afswtch *rafp __unused)
 {
 	int	mode;
 
@@ -152,7 +156,8 @@ set80211authmode(const char *val, int d, int s, const struct afswtch *rafp)
 }
 
 void
-set80211powersavemode(const char *val, int d, int s, const struct afswtch *rafp)
+set80211powersavemode(const char *val, int d __unused, int s,
+		      const struct afswtch *rafp __unused)
 {
 	int	mode;
 
@@ -174,7 +179,8 @@ set80211powersavemode(const char *val, int d, int s, const struct afswtch *rafp)
 }
 
 void
-set80211powersave(const char *val, int d, int s, const struct afswtch *rafp)
+set80211powersave(const char *val __unused, int d, int s,
+		  const struct afswtch *rafp __unused)
 {
 	if (d == 0)
 		set80211(s, IEEE80211_IOC_POWERSAVE, IEEE80211_POWERSAVE_OFF,
@@ -185,13 +191,15 @@ set80211powersave(const char *val, int d, int s, const struct afswtch *rafp)
 }
 
 void
-set80211powersavesleep(const char *val, int d, int s, const struct afswtch *rafp)
+set80211powersavesleep(const char *val, int d __unused, int s,
+		       const struct afswtch *rafp __unused)
 {
 	set80211(s, IEEE80211_IOC_POWERSAVESLEEP, atoi(val), 0, NULL);
 }
 
 void
-set80211wepmode(const char *val, int d, int s, const struct afswtch *rafp)
+set80211wepmode(const char *val, int d __unused, int s,
+		const struct afswtch *rafp __unused)
 {
 	int	mode;
 
@@ -209,19 +217,22 @@ set80211wepmode(const char *val, int d, int s, const struct afswtch *rafp)
 }
 
 void
-set80211wep(const char *val, int d, int s, const struct afswtch *rafp)
+set80211wep(const char *val __unused, int d, int s,
+	    const struct afswtch *rafp __unused)
 {
 	set80211(s, IEEE80211_IOC_WEP, d, 0, NULL);
 }
 
 void
-set80211weptxkey(const char *val, int d, int s, const struct afswtch *rafp)
+set80211weptxkey(const char *val, int d __unused, int s,
+		 const struct afswtch *rafp __unused)
 {
 	set80211(s, IEEE80211_IOC_WEPTXKEY, atoi(val)-1, 0, NULL);
 }
 
 void
-set80211wepkey(const char *val, int d, int s, const struct afswtch *rafp)
+set80211wepkey(const char *val, int d __unused, int s,
+	       const struct afswtch *rafp __unused)
 {
 	int		key = 0;
 	int		len;
@@ -245,7 +256,8 @@ set80211wepkey(const char *val, int d, int s, const struct afswtch *rafp)
  * it's not all that hard.
  */
 void
-set80211nwkey(const char *val, int d, int s, const struct afswtch *rafp)
+set80211nwkey(const char *val, int d __unused, int s,
+	      const struct afswtch *rafp __unused)
 {
 	int		txkey;
 	int		i, len;
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index a321137d18..9cf1db6487 100644
--- a/sbin/ifconfig/ifmedia.c
+++ b/sbin/ifconfig/ifmedia.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $	*/
 /* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.6.2.3 2001/11/14 04:35:07 yar Exp $ */
-/* $DragonFly: src/sbin/ifconfig/ifmedia.c,v 1.6 2004/12/18 21:43:38 swildner Exp $ */
+/* $DragonFly: src/sbin/ifconfig/ifmedia.c,v 1.7 2005/03/04 00:11:11 cpressey Exp $ */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
@@ -183,7 +183,8 @@ media_status(int s, struct rt_addrinfo *info __unused)
 }
 
 void
-setmedia(const char *val, int d, int s, const struct afswtch *afp)
+setmedia(const char *val, int d __unused, int s,
+	 const struct afswtch *afp __unused)
 {
 	struct ifmediareq ifmr;
 	int first_type, subtype;
@@ -225,14 +226,16 @@ setmedia(const char *val, int d, int s, const struct afswtch *afp)
 }
 
 void
-setmediaopt(const char *val, int d, int s, const struct afswtch *afp)
+setmediaopt(const char *val, int d __unused, int s,
+	    const struct afswtch *afp __unused)
 {
 
 	domediaopt(val, 0, s);
 }
 
 void
-unsetmediaopt(const char *val, int d, int s, const struct afswtch *afp)
+unsetmediaopt(const char *val, int d __unused, int s,
+	      const struct afswtch *afp __unused)
 {
 
 	domediaopt(val, 1, s);
diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
index 0d6fcc2ee5..a85c425963 100644
--- a/sbin/ifconfig/ifvlan.c
+++ b/sbin/ifconfig/ifvlan.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.2 1999/08/28 00:13:09 peter Exp $
- * $DragonFly: src/sbin/ifconfig/ifvlan.c,v 1.4 2003/09/28 14:39:18 hmp Exp $
+ * $DragonFly: src/sbin/ifconfig/ifvlan.c,v 1.5 2005/03/04 00:11:11 cpressey Exp $
  *
  * $FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.2 1999/08/28 00:13:09 peter Exp $
  */
@@ -80,7 +80,8 @@ void vlan_status(int s, struct rt_addrinfo *info __unused)
 	return;
 }
 
-void setvlantag(const char *val, int d, int s, const struct afswtch *afp)
+void setvlantag(const char *val, int d __unused, int s,
+		const struct afswtch *afp __unused)
 {
 	u_int16_t		tag;
 	struct vlanreq		vreq;
@@ -102,7 +103,8 @@ void setvlantag(const char *val, int d, int s, const struct afswtch *afp)
 	return;
 }
 
-void setvlandev(const char *val, int d, int s, const struct afswtch *afp)
+void setvlandev(const char *val, int d __unused, int s,
+		const struct afswtch *afp __unused)
 {
 	struct vlanreq		vreq;
 
@@ -124,7 +126,8 @@ void setvlandev(const char *val, int d, int s, const struct afswtch *afp)
 	return;
 }
 
-void unsetvlandev(const char *val, int d, int s, const struct afswtch *afp)
+void unsetvlandev(const char *val __unused, int d __unused, int s,
+		  const struct afswtch *afp __unused)
 {
 	struct vlanreq		vreq;
 
-- 
2.41.0