diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index 6c93bdc0060d..e09ced5ad888 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -174,7 +174,7 @@ domode(struct icmpstat *ret)
 	DO(icps_bmcasttstamp);
 #undef DO
 }
-	
+
 void
 showicmp(void)
 {
@@ -188,7 +188,7 @@ showicmp(void)
 		totalin += stats.icps_inhist[i];
 		totalout += stats.icps_outhist[i];
 	}
-	totalin += stats.icps_badcode + stats.icps_badlen + 
+	totalin += stats.icps_badcode + stats.icps_badlen +
 		stats.icps_checksum + stats.icps_tooshort;
 	mvwprintw(wnd, 1, 0, "%9lu", totalin);
 	mvwprintw(wnd, 1, 35, "%9lu", totalout);
diff --git a/usr.bin/systat/icmp6.c b/usr.bin/systat/icmp6.c
index 9a44622e8368..28a9af7a10ab 100644
--- a/usr.bin/systat/icmp6.c
+++ b/usr.bin/systat/icmp6.c
@@ -171,7 +171,7 @@ domode(struct icmp6stat *ret)
 	}
 #undef DO
 }
-	
+
 void
 showicmp6(void)
 {
@@ -185,7 +185,7 @@ showicmp6(void)
 		totalin += stats.icp6s_inhist[i];
 		totalout += stats.icp6s_outhist[i];
 	}
-	totalin += stats.icp6s_badcode + stats.icp6s_badlen + 
+	totalin += stats.icp6s_badcode + stats.icp6s_badlen +
 		stats.icp6s_checksum + stats.icp6s_tooshort;
 	mvwprintw(wnd, 1, 0, "%9lu", totalin);
 	mvwprintw(wnd, 1, 35, "%9lu", totalout);
diff --git a/usr.bin/systat/ifstat.c b/usr.bin/systat/ifstat.c
index 3731a17201e5..af3e2ea2f0d4 100644
--- a/usr.bin/systat/ifstat.c
+++ b/usr.bin/systat/ifstat.c
@@ -52,7 +52,7 @@
                                 /* Column numbers */
 
 #define C1	0		/*  0-19 */
-#define C2	20		/* 20-39 */ 
+#define C2	20		/* 20-39 */
 #define C3	40		/* 40-59 */
 #define C4	60		/* 60-80 */
 #define C5	80		/* Used for label positioning. */
@@ -65,7 +65,7 @@ static const int col4 = C4;
 static const int col5 = C5;
 
 
-SLIST_HEAD(, if_stat)		curlist;	
+SLIST_HEAD(, if_stat)		curlist;
 SLIST_HEAD(, if_stat_disp)	displist;
 
 struct if_stat {
@@ -204,7 +204,7 @@ showifstat(void)
 	return;
 }
 
-int 
+int
 initifstat(void)
 {
 	struct   if_stat *p = NULL;
@@ -226,7 +226,7 @@ initifstat(void)
 		getifmibdata(p->if_row, &p->if_mib);
 		right_align_string(p);
 
-		/* 
+		/*
 		 * Initially, we only display interfaces that have
 		 * received some traffic.
 		 */
@@ -249,11 +249,11 @@ fetchifstat(void)
 	u_int	we_need_to_sort_interface_list = 0;
 
 	SLIST_FOREACH(ifp, &curlist, link) {
-		/* 
+		/*
 		 * Grab a copy of the old input/output values before we
 		 * call getifmibdata().
 		 */
-		old_inb = ifp->if_mib.ifmd_data.ifi_ibytes;		
+		old_inb = ifp->if_mib.ifmd_data.ifi_ibytes;
 		old_outb = ifp->if_mib.ifmd_data.ifi_obytes;
 		ifp->tv_lastchanged = ifp->if_mib.ifmd_data.ifi_lastchange;
 
@@ -269,7 +269,7 @@ fetchifstat(void)
 		if (new_inb > 0 && old_inb == 0) {
 			ifp->display = 1;
 			we_need_to_sort_interface_list++;
-		} 
+		}
 
 		/*
 		 * The rest is pretty trivial.  Calculate the new values
@@ -308,7 +308,7 @@ fetchifstat(void)
 	return;
 }
 
-/* 
+/*
  * We want to right justify our interface names against the first column
  * (first sixteen or so characters), so we need to do some alignment.
  */
@@ -348,7 +348,7 @@ void
 sort_interface_list(void)
 {
 	struct	if_stat	*ifp = NULL;
-	u_int	y = 0;	
+	u_int	y = 0;
 
 	y = STARTING_ROW;
 	SLIST_FOREACH(ifp, &curlist, link) {
@@ -378,7 +378,7 @@ getifnum(void)
 	return data;
 }
 
-static void 
+static void
 getifmibdata(int row, struct ifmibdata *data)
 {
 	size_t	datalen = 0;
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index f8039bc9e78e..59c247d4e58a 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -121,7 +121,7 @@ initiostat()
 	last.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo));
 	bzero(cur.dinfo, sizeof(struct devinfo));
 	bzero(last.dinfo, sizeof(struct devinfo));
-	
+
 	/*
 	 * This value for maxshowdevs (100) is bogus.  I'm not sure exactly
 	 * how to calculate it, though.
@@ -149,7 +149,7 @@ fetchiostat()
 	cur.dinfo = tmp_dinfo;
 
 	last.snap_time = cur.snap_time;
-         
+
 	/*
 	 * Here what we want to do is refresh our device stats.
 	 * getdevs() returns 1 when the device list has changed.
@@ -252,7 +252,7 @@ barlabels(row)
 				break;
 			sprintf(tmpstr, "%s%d", dev_select[i].device_name,
 				dev_select[i].unit_number);
-			mvwprintw(wnd, row++, 0, "%-5.5s MB/s|", 
+			mvwprintw(wnd, row++, 0, "%-5.5s MB/s|",
 				  tmpstr);
 			mvwaddstr(wnd, row++, 0, "      tps|");
 			if (kbpt)
@@ -319,7 +319,7 @@ devstats(row, _col, dn)
 	long double kb_per_transfer, mb_per_second;
 	long double busy_seconds;
 	int di;
-	
+
 	di = dev_select[dn].position;
 
 	busy_seconds = cur.snap_time - last.snap_time;
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index b6a6954bc010..f811f2ff6580 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -201,7 +201,7 @@ domode(struct stat *ret)
 	DO(u.udps_opackets);
 #undef DO
 }
-	
+
 void
 showip(void)
 {
diff --git a/usr.bin/systat/ip6.c b/usr.bin/systat/ip6.c
index b924b574f5f6..6c7a1b9c7e0f 100644
--- a/usr.bin/systat/ip6.c
+++ b/usr.bin/systat/ip6.c
@@ -75,7 +75,7 @@ static struct ip6stat curstat, initstat, oldstat;
 059999999 total fragments received 999999999 - fragmentation failed
 069999999 - fragments dropped      999999999 destinations unreachable
 079999999 - fragments timed out    999999999 packets output via raw IP
-089999999 - fragments overflown   
+089999999 - fragments overflown
 099999999 - packets reassembled ok           Input next-header histogram
 109999999 packets forwarded        999999999  - destination options
 119999999 - unreachable dests      999999999  - hop-by-hop options
@@ -86,7 +86,7 @@ static struct ip6stat curstat, initstat, oldstat;
 169999999 bad scope packets        999999999  - routing header
 179999999 address selection failed 999999999  - fragmentation header
 18                                 999999999  - ICMP6
-19                                 999999999  - none                     
+19                                 999999999  - none
 --0123456789012345678901234567890123456789012345678901234567890123456789012345
 --0         1         2         3         4         5         6         7
 */
@@ -188,7 +188,7 @@ domode(struct ip6stat *ret)
 	DO(ip6s_sources_none);
 #undef DO
 }
-	
+
 void
 showip6(void)
 {
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 071a6dd097c9..980e06480fde 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -109,11 +109,11 @@ main(int argc, char **argv)
 	}
 	kd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, errbuf);
 	if (kd != NULL) {
-		/* 
+		/*
 		 * Try to actually read something, we may be in a jail, and
 		 * have /dev/null opened as /dev/mem.
 		 */
-		if (kvm_nlist(kd, namelist) != 0 || namelist[0].n_value == 0 || 
+		if (kvm_nlist(kd, namelist) != 0 || namelist[0].n_value == 0 ||
 		    kvm_read(kd, namelist[0].n_value, &dummy, sizeof(dummy)) !=
 		    sizeof(dummy)) {
 			kvm_close(kd);
@@ -121,7 +121,7 @@ main(int argc, char **argv)
 		}
 	}
 	if (kd == NULL) {
-		/* 
+		/*
 		 * Maybe we are lacking permissions? Retry, this time with bogus
 		 * devices. We can now use sysctl only.
 		 */
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index adb905a59053..9fe687f2b60c 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -143,7 +143,7 @@ closenetstat(w)
 
 static const char *miblist[] = {
 	"net.inet.tcp.pcblist",
-	"net.inet.udp.pcblist" 
+	"net.inet.udp.pcblist"
 };
 
 struct nlist namelist[] = {
@@ -274,9 +274,9 @@ fetchnetstat_sysctl()
 			error("sysctl(%s...) failed", miblist[idx]);
 			continue;
 		}
-		/* 
+		/*
 		 * We currently do no require a consistent pcb list.
-		 * Try to be robust in case of struct size changes 
+		 * Try to be robust in case of struct size changes
 		 */
 		cur = ((char *)inpg) + inpg->xig_len;
 		/* There is also a trailing struct xinpgen */
@@ -322,7 +322,7 @@ fetchnetstat_sysctl()
 			if (nports && !checkport(inpcb))
 				continue;
 			if (idx == 0)	/* TCP */
-				enter_sysctl(inpcb, &xtp->xt_socket, 
+				enter_sysctl(inpcb, &xtp->xt_socket,
 				    xtp->xt_tp.t_state, "tcp");
 			else		/* UDP */
 				enter_sysctl(inpcb, &xip->xi_socket, 0, "udp");
@@ -574,10 +574,10 @@ inetprint(sa, proto)
 	if (!nflag && port)
 		sp = getservbyport(port, proto);
 	if (sp || port == 0)
-		snprintf(cp, sizeof(line) - (cp - line), "%.8s", 
+		snprintf(cp, sizeof(line) - (cp - line), "%.8s",
 		    sp ? sp->s_name : "*");
 	else
-		snprintf(cp, sizeof(line) - (cp - line), "%d", 
+		snprintf(cp, sizeof(line) - (cp - line), "%d",
 		    ntohs((u_short)port));
 	/* pad to full column to clear any garbage */
 	cp = index(line, '\0');
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index 7a13dbcffd08..7729afd22931 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -170,11 +170,11 @@ showswap()
 		}
 
 		mvwprintw(
-		    wnd, 
-		    i + 1, 
+		    wnd,
+		    i + 1,
 		    lcol,
 		    "%*d",
-		    hlen, 
+		    hlen,
 		    CONVERT(kvmsw[i].ksw_total)
 		);
 		lcol += hlen;
@@ -182,7 +182,7 @@ showswap()
 		mvwprintw(
 		    wnd,
 		    i + 1,
-		    lcol, 
+		    lcol,
 		    "%9d  ",
 		    CONVERT(kvmsw[i].ksw_used)
 		);
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index 8221d42080b4..501d3d7b1bb8 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -49,12 +49,12 @@ struct  cmdtab {
 	char	c_flags;		/* see below */
 };
 
-/* 
+/*
  * If we are started with privileges, use a kmem interface for netstat handling,
  * otherwise use sysctl.
  * In case of many open sockets, the sysctl handling might become slow.
  */
-extern int use_kvm; 
+extern int use_kvm;
 
 #define	CF_INIT		0x1		/* been initialized */
 #define	CF_LOADAV	0x2		/* display w/ load average */
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index a758f156cf40..d247bf2fcd53 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -227,7 +227,7 @@ domode(struct tcpstat *ret)
 	DO(tcps_listendrop);
 #undef DO
 }
-	
+
 void
 showtcp(void)
 {