MFC r310648:

style(9): clean up trailing whitespace

24 files changed, 70 insertions, 70 deletions

diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
index 83c4e5c..85339a3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
@@ -4,7 +4,7 @@
 -- 	All rights reserved.
 --
 -- Author: Hartmut Brandt <harti@freebsd.org>
--- 
+--
 -- Redistribution and use in source and binary forms, with or without
 -- modification, are permitted provided that the following conditions
 -- are met:
@@ -13,7 +13,7 @@
 -- 2. Redistributions in binary form must reproduce the above copyright
 --    notice, this list of conditions and the following disclaimer in the
 --    documentation and/or other materials provided with the distribution.
--- 
+--
 -- THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 -- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -25,7 +25,7 @@
 -- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 -- SUCH DAMAGE.
---  
+--
 -- $FreeBSD$
 --
 -- Private Begemot MIB for ATM interfaces on FreeBSD
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c b/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
index 525e805..c0699f7 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
@@ -7,7 +7,7 @@
  *	All rights reserved.
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -215,7 +215,7 @@ atmif_sys_attach_if(struct atmif_priv *aif)
 	return (0);
 }
 
-/* 
+/*
  * Table of all ATM interfaces - Ng part
  */
 int
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt
index 3fc6b0f..ba3ae49 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt
@@ -111,7 +111,7 @@ begemotBridgePf			OBJECT IDENTIFIER ::= { begemotBridge 4 }
 begemotBridgeConfigObjects	OBJECT IDENTIFIER ::= { begemotBridge 5 }
 
 -- ---------------------------------------------------------- --
--- the base Bridge interface table 
+-- the base Bridge interface table
 -- ---------------------------------------------------------- --
 
 begemotBridgeBaseTable OBJECT-TYPE
@@ -180,7 +180,7 @@ begemotBridgeBaseType OBJECT-TYPE
 	perform."
     ::= { begemotBridgeBaseEntry 4 }
 
-begemotBridgeBaseStatus OBJECT-TYPE 
+begemotBridgeBaseStatus OBJECT-TYPE
     SYNTAX	RowStatus
     MAX-ACCESS	read-create
     STATUS	current
@@ -190,7 +190,7 @@ begemotBridgeBaseStatus OBJECT-TYPE
     ::= { begemotBridgeBaseEntry 5 }
 
 -- ---------------------------------------------------------- --
--- the base Bridge ports table 
+-- the base Bridge ports table
 -- ---------------------------------------------------------- --
 
 begemotBridgeBasePortTable OBJECT-TYPE
@@ -292,7 +292,7 @@ begemotBridgeBasePortPrivate OBJECT-TYPE
     ::= { begemotBridgeBasePortEntry 7 }
 
 -- ---------------------------------------------------------- --
--- the Bridge interface STP table 
+-- the Bridge interface STP table
 -- ---------------------------------------------------------- --
 
 begemotBridgeStpTable OBJECT-TYPE
@@ -529,7 +529,7 @@ begemotBridgeStpTxHoldCount OBJECT-TYPE
     ::= { begemotBridgeStpEntry 16 }
 
 -- ---------------------------------------------------------- --
--- the Bridge STP ports table 
+-- the Bridge STP ports table
 -- ---------------------------------------------------------- --
 
 begemotBridgeStpPortTable OBJECT-TYPE
@@ -824,7 +824,7 @@ begemotBridgeStpPortAdminPathCost OBJECT-TYPE
     ::= { begemotBridgeStpExtPortEntry 6 }
 
 -- ---------------------------------------------------------- --
--- the Bridge interface Transparent bridging table 
+-- the Bridge interface Transparent bridging table
 -- ---------------------------------------------------------- --
 
 begemotBridgeTpTable OBJECT-TYPE
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
index 0daceec..33de19f 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
@@ -330,7 +330,7 @@ bridge_addrs_dump(struct bridge_if *bif)
  */
 
 /*
- * Construct the SNMP index from the address DST Mac. 
+ * Construct the SNMP index from the address DST Mac.
  */
 static void
 bridge_addrs_index_append(struct asn_oid *oid, uint sub,
@@ -449,7 +449,7 @@ get:
 
 /*
  * Construct the SNMP index from the bridge interface name
- * and the address DST Mac. 
+ * and the address DST Mac.
  */
 static int
 bridge_addrs_begemot_index_append(struct asn_oid *oid, uint sub,
@@ -477,7 +477,7 @@ bridge_addrs_begemot_index_append(struct asn_oid *oid, uint sub,
 
 /*
  * Find a bridge address entry by the bridge interface name
- * and the address DST Mac. 
+ * and the address DST Mac.
  */
 static struct tp_entry *
 bridge_addrs_begemot_get(const struct asn_oid *oid, uint sub)
@@ -507,7 +507,7 @@ bridge_addrs_begemot_get(const struct asn_oid *oid, uint sub)
 
 /*
  * Find the next bridge address entry by the bridge interface name
- * and the address DST Mac. 
+ * and the address DST Mac.
  */
 static struct tp_entry *
 bridge_addrs_begemot_getnext(const struct asn_oid *oid, uint sub)
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
index e5f5c50..fd7fba0 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
@@ -433,7 +433,7 @@ bridge_update_bif(struct bridge_if *bif)
 }
 
 /*
- * Update all bridge interfaces' ports only - 
+ * Update all bridge interfaces' ports only -
  * make sure each bridge interface exists first.
  */
 void
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
index 0127cea..cbb8dc8 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
@@ -626,7 +626,7 @@ op_dot1d_stp_ext_port(struct snmp_context *ctx, struct snmp_value *val,
 			    return (SNMP_ERR_NOERROR);
 
 			case LEAF_dot1dStpPortAdminPointToPoint:
-			    if (val->v.integer < 0 || val->v.integer > 
+			    if (val->v.integer < 0 || val->v.integer >
 				StpPortAdminPointToPointType_auto)
 				return (SNMP_ERR_WRONG_VALUE);
 
@@ -864,7 +864,7 @@ bridge_port_index_getnext(const struct asn_oid *oid, uint sub, int8_t status)
 		for (i = 0; i < oid->subs[sub]; i++)
 			bif_name[i] = oid->subs[sub + i + 1];
 		bif_name[i] = '\0';
-	
+
 		port_no = oid->subs[sub + i + 1];
 
 		if ((bif = bridge_if_find_ifname(bif_name)) == NULL ||
@@ -937,7 +937,7 @@ bridge_port_set_status(struct snmp_context *ctx,
 		ctx->scratch->int1 = bp->status;
 		bp->status = RowStatus_active;
 		break;
-		
+
 	    case RowStatus_notInService:
 		if (bp == NULL || bp->span_enable == 0 ||
 		    bp->status == RowStatus_active)
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
index b8e66a6..d327e82 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
@@ -295,7 +295,7 @@ bridge_set_priority(struct bridge_if *bif, int32_t priority)
 
 	/*
 	 * Re-fetching the data from the driver after that might be a good
-	 * idea, since changing our bridge's priority should invoke 
+	 * idea, since changing our bridge's priority should invoke
 	 * recalculation of the active spanning tree topology in the network.
 	 */
 	bif->priority = priority;
@@ -1319,7 +1319,7 @@ bridge_addrs_getinfo_ifalist(struct bridge_if *bif, struct ifbareq **buf)
 	struct ifbaconf bac;
 	struct ifdrv ifd;
 
-	*buf = NULL; 
+	*buf = NULL;
 	strlcpy(ifd.ifd_name, bif->bif_name, IFNAMSIZ);
 	ifd.ifd_cmd = BRDGRTS;
 	ifd.ifd_len = sizeof(bac);
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3 b/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
index 09484cf..4f3c5e7 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
@@ -1,7 +1,7 @@
 .\"-
 .\" Copyright (C) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -10,7 +10,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3 b/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
index 73036c0..cebb06b 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
@@ -2,7 +2,7 @@
 .\" Copyright (C) 2005-2006
 .\" 	The FreeBSD Project.
 .\" 	All rights reserved.
-.\" 
+.\"
 .\" Author: Harti Brandt <harti@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
index d9d136a..4b1da05 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
@@ -173,7 +173,7 @@ ng_unregister_cookie(void *dd)
  * Register a function for hook data.
  */
 void *
-ng_register_hook(const struct lmodule *mod, const char *hook, 
+ng_register_hook(const struct lmodule *mod, const char *hook,
     ng_hook_f *func, void *arg)
 {
 	struct datareg *d;
@@ -893,7 +893,7 @@ ng_peer_hook_id(ng_ID_t node, const char *hook, char *peerhook)
 		else
 			strcpy(peerhook, hooklist->link[i].peerhook);
 
-	} else 
+	} else
 		strcpy(peerhook, hooklist->link[i].peerhook);
 
 	free(resp);
@@ -903,7 +903,7 @@ ng_peer_hook_id(ng_ID_t node, const char *hook, char *peerhook)
 
 
 /*
- * Now the module is started. Select on the sockets, so that we can get 
+ * Now the module is started. Select on the sockets, so that we can get
  * unsolicited input.
  */
 static void
@@ -926,7 +926,7 @@ ng_start(void)
 		return;
 	}
 
-	reg_index = or_register(&oid_begemotNg, 
+	reg_index = or_register(&oid_begemotNg,
 	    "The MIB for the NetGraph access module for SNMP.", module);
 }
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
index d2b247f..d92b6ac 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
@@ -1,4 +1,4 @@
--- 
+--
 -- ----------------------------------------------------------------------------
 -- "THE BEER-WARE LICENSE" (Revision 42):
 -- <philip@FreeBSD.org> wrote this file.  As long as you retain this notice you
@@ -7,7 +7,7 @@
 -- ----------------------------------------------------------------------------
 --
 -- $FreeBSD$
--- 
+--
 
 BEGEMOT-PF-MIB DEFINITIONS ::= BEGIN
 
@@ -612,7 +612,7 @@ pfInterfacesIfIndex OBJECT-TYPE
     DESCRIPTION
 	"A unique value, greater than zero, for each interface."
     ::= { pfInterfacesIfEntry 1 }
-    
+
 pfInterfacesIfDescr OBJECT-TYPE
     SYNTAX	OCTET STRING
     MAX-ACCESS	read-only
@@ -876,7 +876,7 @@ pfTablesTblTZero OBJECT-TYPE
         cleared or the time since this table was loaded, whichever is
         sooner."
     ::= { pfTablesTblEntry 4 }
-	
+
 pfTablesTblRefsAnchor OBJECT-TYPE
     SYNTAX	Integer32
     MAX-ACCESS  read-only
@@ -1294,7 +1294,7 @@ pfLabelsLblIndex OBJECT-TYPE
     STATUS	current
     DESCRIPTION
 	"A unique value, greater than zero, for each label."
-    ::= { pfLabelsLblEntry 1 } 
+    ::= { pfLabelsLblEntry 1 }
 
 pfLabelsLblName OBJECT-TYPE
     SYNTAX	OCTET STRING
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
index 6218932..efe2e95 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-# 
+#
 # Author: Philip Paeps <philip@freebsd.org>
 
 MOD=	pf
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
index 1048ffe..c35f0db 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
@@ -650,7 +650,7 @@ pf_iftable(struct snmp_context __unused *ctx, struct snmp_value *val,
 			    e->pfi.pfik_packets[IPV6][OUT][PASS];
 			break;
 		case LEAF_pfInterfacesIf6PktsOutBlock:
-			val->v.counter64 = 
+			val->v.counter64 =
 			    e->pfi.pfik_packets[IPV6][OUT][BLOCK];
 			break;
 
@@ -932,7 +932,7 @@ pf_altq(struct snmp_context __unused *ctx, struct snmp_value *val,
 
 	abort();
 	return (SNMP_ERR_GENERR);
-}	
+}
 
 int
 pf_altqq(struct snmp_context __unused *ctx, struct snmp_value *val,
@@ -987,7 +987,7 @@ pf_altqq(struct snmp_context __unused *ctx, struct snmp_value *val,
 		case LEAF_pfAltqQueueLimit:
 			val->v.integer = e->altq.qlimit;
 			break;
-		
+
 		default:
 			return (SNMP_ERR_NOSUCHNAME);
 	}
@@ -1225,7 +1225,7 @@ pfq_refresh(void)
 	}
 
 	bzero(&pa, sizeof(pa));
-	
+
 	if (ioctl(dev, DIOCGETALTQS, &pa)) {
 		syslog(LOG_ERR, "pfq_refresh: ioctl(DIOCGETALTQS): %s",
 		    strerror(errno));
@@ -1260,7 +1260,7 @@ pfq_refresh(void)
 			INSERT_OBJECT_INT_LINK_INDEX(e, &pfq_table, link, index);
 		}
 	}
-	
+
 	pfq_table_age = time(NULL);
 	pf_tick = this_tick;
 
@@ -1648,7 +1648,7 @@ altq_is_enabled(int pfdev)
 			syslog(LOG_INFO, "No ALTQ support in kernel\n"
 			    "ALTQ related functions disabled\n");
                         return (0);
-                } else  
+                } else
                         syslog(LOG_ERR, "DIOCGETALTQS returned an error: %s",
 			    strerror(errno));
 			return (-1);
@@ -1674,7 +1674,7 @@ pf_init(struct lmodule *mod, int __unused argc, char __unused *argv[])
 		syslog(LOG_ERR, "pf_init(): altq test failed");
 		return (-1);
 	}
-	
+
 	/* Prepare internal state */
 	TAILQ_INIT(&pfi_table);
 	TAILQ_INIT(&pfq_table);
@@ -1765,7 +1765,7 @@ pf_dump(void)
 	    (intmax_t)pfi_table_age);
 	syslog(LOG_ERR, "Dump: pfi_table_count = %d",
 	    pfi_table_count);
-	
+
 	syslog(LOG_ERR, "Dump: pfq_table_age = %jd",
 	    (intmax_t)pfq_table_age);
 	syslog(LOG_ERR, "Dump: pfq_table_count = %d",
diff --git a/usr.sbin/bsnmpd/modules/snmp_target/Makefile b/usr.sbin/bsnmpd/modules/snmp_target/Makefile
index 10141e5..e6216ea 100644
--- a/usr.sbin/bsnmpd/modules/snmp_target/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_target/Makefile
@@ -15,6 +15,6 @@ CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -DSNMPTREE_TYPES
 CFLAGS+= -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY -DHAVE_SYS_TREE_H
 
 DEFS=	${MOD}_tree.def
-BMIBS=	
+BMIBS=
 
 .include <bsd.snmpmod.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
index 4ae818a..1c42245 100644
--- a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
@@ -17,6 +17,6 @@ CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -DSNMPTREE_TYPES
 CFLAGS+= -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY -DHAVE_SYS_TREE_H
 
 DEFS=	${MOD}_tree.def
-BMIBS=	
+BMIBS=
 
 .include <bsd.snmpmod.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
index 1be8d62..4a09cde 100644
--- a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
@@ -15,6 +15,6 @@ CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -DSNMPTREE_TYPES
 CFLAGS+= -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY -DHAVE_SYS_TREE_H
 
 DEFS=	${MOD}_tree.def
-BMIBS=	
+BMIBS=
 
 .include <bsd.snmpmod.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
index ec94ac6..92091f0 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
@@ -1841,7 +1841,7 @@ op_wlan_wep_iface(struct snmp_context *ctx, struct snmp_value *val,
 	default:
 		abort();
 	}
-	
+
 	return (SNMP_ERR_NOERROR);
 }
 
@@ -3435,7 +3435,7 @@ wlan_get_channel_type(struct ieee80211_channel *c)
 		return (WlanChannelType_turbo);
 	if (IEEE80211_IS_CHAN_HT(c))
 		return (WlanChannelType_ht);
-		
+
 	return (-1);
 }
 
@@ -3740,7 +3740,7 @@ wlan_scan_add_result(struct wlan_iface *wif, struct wlan_scan_result *sr)
 	    	SLIST_INSERT_HEAD(&wif->scanlist, sr, wsr);
 	    	return (0);
 	}
-	
+
 	SLIST_FOREACH(temp, &wif->scanlist, wsr) {
 		if (wlan_scan_compare_result(sr, temp) < 0)
 			break;
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
index 9e184f5..de6587f 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
@@ -182,7 +182,7 @@ struct wlan_iface {
 	enum wlanHWMPRootMode		hwmp_root_mode;
 	uint32_t			hwmp_max_hops;
 	struct wlan_mesh_routes		mesh_routelist;
-		
+
 	SLIST_ENTRY(wlan_iface)		w_if;
 };
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
index 739f11f..9db30ae 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
- 
+
  * This software was developed by Shteryana Sotirova Shopova under
  * sponsorship from the FreeBSD Foundation.
  *
@@ -158,7 +158,7 @@ wlan_kmodules_load(void)
 		syslog(LOG_NOTICE, "SNMP wlan loaded %s module",
 		    wmod_names[WLAN_KMOD_WEP]);
 
-	return (0);	
+	return (0);
 }
 
 /* XXX: FIXME */
@@ -2387,7 +2387,7 @@ wlan_get_mac_policy(struct wlan_iface *wif)
 			wif->mac_policy = wlanMACAccessControlPolicy_open;
 			return (0);
 		}
-		
+
 	}
 
 	wif->macsupported = 1;
diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
index 5f79840..1aeafd3 100644
--- a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
+++ b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
@@ -777,7 +777,7 @@ parse_syntax_val(struct snmp_value *value, enum snmp_syntax syntax, char *val)
 }
 
 /*
- * Parse a command line argument of type OID=syntax:value and fill in whatever 
+ * Parse a command line argument of type OID=syntax:value and fill in whatever
  * fields can be derived from the input into snmp_value structure. Reads numeric
  * OIDs.
  */
@@ -909,7 +909,7 @@ parse_pair_stroid_val(struct snmp_toolinfo *snmptoolctx,
 
 	if ((ptr = snmptools_parse_stroid(snmptoolctx, obj, argv)) == NULL)
 		return (-1);
- 
+
 	if (*ptr != '=') {
 		warnx("Value to set expected after OID");
 		return (-1);
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
index 09684ac..d4f305f 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
@@ -53,7 +53,7 @@
  * subtype := STRING
  *
  * enum := ENUM '(' value ')'
- * 
+ *
  * bits := BITS '(' value ')'
  *
  * value := INT STRING | INT STRING value
@@ -483,7 +483,7 @@ snmp_import_update_table(enum snmp_tbl_entry te, struct snmp_index_entry *tbl)
 	switch (te) {
 		case ENTRY_NONE:
 			if (table_data.tbl_type == ENTRY_NONE)
-				return (NULL);	
+				return (NULL);
 			if (table_data.tbl_type == ENTRY_INDEX)
 				table_data.table_idx = NULL;
 			table_data.tbl_type--;
@@ -539,7 +539,7 @@ parse_subtype(struct snmp_toolinfo *snmptoolctx, int32_t *tok,
 		warnx("subtype expected after '|'");
 		return (-1);
 	}
-	
+
 	*tc = snmp_get_tc(nexttok);
 	*tok = gettoken(snmptoolctx);
 
@@ -806,7 +806,7 @@ snmp_import_object(struct snmp_toolinfo *snmptoolctx)
 		if (snmp_suboid_append(&current_oid, (asn_subid_t) val) < 0)
 			goto error;
 
-		/* 
+		/*
 		 * Ignore the error for nodes since the .def files currently
 		 * contain different strings for 1.3.6.1.2.1 - mibII. Only make
 		 * sure the memory is freed and don't complain.
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
index 7e2b721..abee9c2 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
@@ -29,7 +29,7 @@
  * $FreeBSD$
  */
 
-#include <sys/param.h> 
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/uio.h>
 
@@ -636,7 +636,7 @@ snmp_mapping_dumptable(struct snmp_table_index *headp)
 	}
 }
 
-void 
+void
 snmp_mapping_dump(struct snmp_toolinfo *snmptoolctx /* int bits */)
 {
 	if (!_bsnmptools_debug)
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
index d945b89..cd7316f 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
@@ -31,7 +31,7 @@
  * $FreeBSD$
  */
 
-#include <sys/param.h> 
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
@@ -1143,7 +1143,7 @@ parse_bport_id(struct snmp_value *value, char *string)
  **************************************************************
  * TODO: FIXME!!! syrinx: Since we do not support checking the
  * consistency of a varbinding based on the value of a previous
- * one, try to guess the type of address based on the 
+ * one, try to guess the type of address based on the
  * OctetString SIZE - 4 for IPv4, 16 for IPv6, others currently
  * not supported.
  */
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
index 3e11bbc..87829d6 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
@@ -31,7 +31,7 @@
  * $FreeBSD$
  */
 
-#include <sys/param.h> 
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/uio.h>
 
@@ -117,7 +117,7 @@ static const struct {
 	{ "Gauge", SNMP_SYNTAX_GAUGE },
 	{ "TimeTicks", SNMP_SYNTAX_TIMETICKS },
 	{ "Counter64", SNMP_SYNTAX_COUNTER64 },
-	{ "Unknown", SNMP_SYNTAX_UNKNOWN }, 
+	{ "Unknown", SNMP_SYNTAX_UNKNOWN },
 };
 
 int
@@ -189,7 +189,7 @@ snmptool_init(struct snmp_toolinfo *snmptoolctx)
 
 #define	OBJECT_IDX_LIST(o)	o->info->table_idx->index_list
 
-/* 
+/*
  * Walk through the file list and import string<->oid mappings from each file.
  */
 int32_t
@@ -287,7 +287,7 @@ free_filelist(struct snmp_toolinfo *snmptoolctx)
 	}
 }
 
-static char 
+static char
 isvalid_fchar(char c, int pos)
 {
 	if (isalpha(c)|| c == '/'|| c == '_' || c == '.' || c == '~' ||
@@ -652,7 +652,7 @@ parse_user_security(struct snmp_toolinfo *snmptoolctx __unused, char *opt_arg)
 				warnx("Suboption 'engine' - no argument");
 				return (-1);
 			}
-			snmp_client.engine.engine_len = parse_ascii(val, 
+			snmp_client.engine.engine_len = parse_ascii(val,
 			    snmp_client.engine.engine_id, SNMP_ENGINE_ID_SIZ);
 			if ((int32_t)snmp_client.engine.engine_len == -1) {
 				warnx("Bad EngineID - %s", val);
@@ -1470,7 +1470,7 @@ snmp_pdu_add_bindings(struct snmp_toolinfo *snmptoolctx,
 	/* Return 0 in case of no more work todo. */
 	if (SLIST_EMPTY(&snmptoolctx->snmp_objectlist))
 		return (0);
-	
+
 	if (maxcount < 0 || maxcount > SNMP_MAX_BINDINGS) {
 		warnx("maxcount out of range: <0 || >SNMP_MAX_BINDINGS");
 		return (-1);