Nuke whitespace foolish enough to expose itself during the great

"warning:" rectification.

27 files changed, 150 insertions, 150 deletions

diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index 031a111a46e..e4d0db1ece3 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: cmds.c,v 1.78 2016/08/14 18:34:48 guenther Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.79 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $	*/
 
 /*
  * Copyright (C) 1997 and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * 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 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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
@@ -143,7 +143,7 @@ reput(int argc, char *argv[])
 void
 put(int argc, char *argv[])
 {
- 
+
 	(void)putit(argc, argv, 0);
 }
 
@@ -1519,7 +1519,7 @@ restart(int argc, char *argv[])
 	}
 }
 
-/* 
+/*
  * Show remote system type
  */
 /* ARGSUSED */
diff --git a/usr.bin/ftp/cmdtab.c b/usr.bin/ftp/cmdtab.c
index 40389c3f056..20361f6f420 100644
--- a/usr.bin/ftp/cmdtab.c
+++ b/usr.bin/ftp/cmdtab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmdtab.c,v 1.28 2015/01/30 04:45:45 tedu Exp $	*/
+/*	$OpenBSD: cmdtab.c,v 1.29 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $	*/
 
 /*
@@ -117,7 +117,7 @@ char	umaskhelp[] =	"get (set) umask on remote side";
 char	userhelp[] =	"send new user information";
 char	verbosehelp[] =	"toggle verbose mode";
 
-#define CMPL(x)	__STRING(x), 
+#define CMPL(x)	__STRING(x),
 #define CMPL0	"",
 #define H(x)	x
 
diff --git a/usr.bin/ftp/complete.c b/usr.bin/ftp/complete.c
index 5e0b00a8c9c..403eb2e3d3a 100644
--- a/usr.bin/ftp/complete.c
+++ b/usr.bin/ftp/complete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: complete.c,v 1.29 2015/10/18 03:04:11 mmcc Exp $	*/
+/*	$OpenBSD: complete.c,v 1.30 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: complete.c,v 1.10 1997/08/18 10:20:18 lukem Exp $	*/
 
 /*-
@@ -104,7 +104,7 @@ complete_ambiguous(char *word, int list, StringList *words)
 			    lastmatch + wordlen, matchlen - wordlen);
 			if (el_insertstr(el, insertstr) == -1)
 				return (CC_ERROR);
-			else	
+			else
 					/*
 					 * XXX: really want CC_REFRESH_BEEP
 					 */
diff --git a/usr.bin/ftp/cookie.c b/usr.bin/ftp/cookie.c
index 60dfaf5760c..22ea989ea3c 100644
--- a/usr.bin/ftp/cookie.c
+++ b/usr.bin/ftp/cookie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cookie.c,v 1.6 2016/12/28 17:48:04 deraadt Exp $	*/
+/*	$OpenBSD: cookie.c,v 1.7 2017/01/21 08:33:07 krw Exp $	*/
 
 /*
  * Copyright (c) 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -49,7 +49,7 @@ TAILQ_HEAD(cookiejar, cookie);
 
 typedef enum {
 	DOMAIN = 0, TAILMATCH = 1, PATH = 2, SECURE = 3,
-	EXPIRES = 4, NAME = 5, VALUE = 6, DONE = 7 
+	EXPIRES = 4, NAME = 5, VALUE = 6, DONE = 7
 } field_t;
 
 static struct cookiejar jar;
@@ -171,7 +171,7 @@ cookie_load(void)
 			free(ck);
 		} else
 			TAILQ_INSERT_TAIL(&jar, ck, entry);
-	}	
+	}
 	free(lbuf);
 	fclose(fp);
 }
diff --git a/usr.bin/ftp/domacro.c b/usr.bin/ftp/domacro.c
index 72b59b55b63..af554c98267 100644
--- a/usr.bin/ftp/domacro.c
+++ b/usr.bin/ftp/domacro.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: domacro.c,v 1.18 2015/10/18 03:04:11 mmcc Exp $	*/
+/*	$OpenBSD: domacro.c,v 1.19 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $	*/
 
 /*
@@ -71,7 +71,7 @@ TOP:
 		cp2 = line;
 		while (*cp1 != '\0') {
 		      switch(*cp1) {
-		   	    case '\\':
+			    case '\\':
 				 *cp2++ = *++cp1;
 				 break;
 			    case '$':
diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index 315f5cea656..3f573b8760d 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: extern.h,v 1.48 2017/01/20 04:03:53 krw Exp $	*/
+/*	$OpenBSD: extern.h,v 1.49 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: extern.h,v 1.17 1997/08/18 10:20:19 lukem Exp $	*/
 
 /*
  * Copyright (C) 1997 and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * 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 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index 22364a08fd5..636d5093d0f 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fetch.c,v 1.159 2017/01/20 05:51:50 krw Exp $	*/
+/*	$OpenBSD: fetch.c,v 1.160 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
 
 /*-
@@ -100,8 +100,8 @@ static int	redirect_loop;
 
 /*
  * Determine whether the character needs encoding, per RFC1738:
- * 	- No corresponding graphic US-ASCII.
- * 	- Unsafe characters.
+ *	- No corresponding graphic US-ASCII.
+ *	- Unsafe characters.
  */
 static int
 unsafe_char(const char *c0)
diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h
index c892e189c39..952eb945093 100644
--- a/usr.bin/ftp/ftp_var.h
+++ b/usr.bin/ftp/ftp_var.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: ftp_var.h,v 1.39 2016/12/28 17:48:04 deraadt Exp $	*/
+/*	$OpenBSD: ftp_var.h,v 1.40 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: ftp_var.h,v 1.18 1997/08/18 10:20:25 lukem Exp $	*/
 
 /*
  * Copyright (C) 1997 and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * 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 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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.bin/ftp/main.c b/usr.bin/ftp/main.c
index 7b47cf4436a..aa460ad84da 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: main.c,v 1.117 2017/01/20 04:03:53 krw Exp $	*/
+/*	$OpenBSD: main.c,v 1.118 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
 
 /*
  * Copyright (C) 1997 and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * 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 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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
@@ -334,10 +334,10 @@ main(volatile int argc, char *argv[])
 			break;
 
 		case 'k':
-			keep_alive_timeout = strtonum(optarg, 0, INT_MAX, 
+			keep_alive_timeout = strtonum(optarg, 0, INT_MAX,
 			    &errstr);
 			if (errstr != NULL) {
-				warnx("keep alive amount is %s: %s", errstr, 
+				warnx("keep alive amount is %s: %s", errstr,
 					optarg);
 				usage();
 			}
@@ -377,7 +377,7 @@ main(volatile int argc, char *argv[])
 		case 'r':
 			retry_connect = strtonum(optarg, 0, INT_MAX, &errstr);
 			if (errstr != NULL) {
-				warnx("retry amount is %s: %s", errstr, 
+				warnx("retry amount is %s: %s", errstr,
 					optarg);
 				usage();
 			}
diff --git a/usr.bin/ftp/small.c b/usr.bin/ftp/small.c
index 66d31d59e0d..07f5ddd214b 100644
--- a/usr.bin/ftp/small.c
+++ b/usr.bin/ftp/small.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: small.c,v 1.8 2017/01/20 01:19:18 krw Exp $	*/
+/*	$OpenBSD: small.c,v 1.9 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $	*/
 
 /*
  * Copyright (C) 1997 and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * 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 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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
@@ -643,7 +643,7 @@ LOOP:
 							cp2++;
 						}
 						else if (*cp2 == '$' &&
-   						        isdigit((unsigned char)*(cp2 + 1))) {
+						        isdigit((unsigned char)*(cp2 + 1))) {
 							if (*++cp2 == '0') {
 							   char *cp3 = name;
 
diff --git a/usr.bin/ftp/stringlist.h b/usr.bin/ftp/stringlist.h
index b33bbf08629..7c5b6ae12ae 100644
--- a/usr.bin/ftp/stringlist.h
+++ b/usr.bin/ftp/stringlist.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stringlist.h,v 1.5 2015/05/20 23:39:55 schwarze Exp $	*/
+/*	$OpenBSD: stringlist.h,v 1.6 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
 #ifndef SMALL
 
 #ifndef _STRINGLIST_H
-#define _STRINGLIST_H 
+#define _STRINGLIST_H
 
 #include <sys/types.h>
 
diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c
index 1dd258c1928..8b61a112093 100644
--- a/usr.bin/ftp/util.c
+++ b/usr.bin/ftp/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.83 2017/01/20 01:19:18 krw Exp $	*/
+/*	$OpenBSD: util.c,v 1.84 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $	*/
 
 /*-
@@ -620,11 +620,11 @@ remotemodtime(const char *file, int noisy)
 	if (command("MDTM %s", file) == COMPLETE) {
 		struct tm timebuf;
 		int yy, mo, day, hour, min, sec;
- 		/*
- 		 * time-val = 14DIGIT [ "." 1*DIGIT ]
- 		 *		YYYYMMDDHHMMSS[.sss]
- 		 * mdtm-response = "213" SP time-val CRLF / error-response
- 		 */
+		/*
+		 * time-val = 14DIGIT [ "." 1*DIGIT ]
+		 *		YYYYMMDDHHMMSS[.sss]
+		 * mdtm-response = "213" SP time-val CRLF / error-response
+		 */
 		/* TODO: parse .sss as well, use timespecs. */
 		char *timestr = reply_string;
 
@@ -634,9 +634,9 @@ remotemodtime(const char *file, int noisy)
 		while (isspace((unsigned char)*timestr))
 			timestr++;
 		if (strncmp(timestr, "191", 3) == 0) {
- 			fprintf(ttyout,
- 	    "Y2K warning! Fixed incorrect time-val received from server.\n");
-	    		timestr[0] = ' ';
+			fprintf(ttyout,
+	    "Y2K warning! Fixed incorrect time-val received from server.\n");
+			timestr[0] = ' ';
 			timestr[1] = '2';
 			timestr[2] = '0';
 		}
@@ -684,7 +684,7 @@ fileindir(const char *file, const char *dir)
 	char	realdir[PATH_MAX];
 	size_t	dirlen;
 
-		 			/* determine parent directory of file */
+					/* determine parent directory of file */
 	(void)strlcpy(parentdirbuf, file, sizeof(parentdirbuf));
 	parentdir = dirname(parentdirbuf);
 	if (strcmp(parentdir, ".") == 0)
@@ -828,7 +828,7 @@ progressmeter(int flag, const char *filename)
 	if (barlength > 0) {
 		i = barlength * ratio / 100;
 		snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-		    "|%.*s%*s|", i, 
+		    "|%.*s%*s|", i,
 		    "*******************************************************"
 		    "*******************************************************"
 		    "*******************************************************"
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index 6e2899df063..18ef7036b3d 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.26 2016/12/25 16:40:06 krw Exp $	*/
+/*	$OpenBSD: main.c,v 1.27 2017/01/21 08:33:07 krw Exp $	*/
 
 /* flex - tool to generate fast lexical analyzers */
 
@@ -136,7 +136,7 @@ static int preproc_level = 1000;
 int flex_main PROTO((int argc, char *argv[]));
 int main PROTO((int argc, char *argv[]));
 
-int 
+int
 flex_main(argc, argv)
 	int argc;
 	char *argv[];
@@ -201,7 +201,7 @@ flex_main(argc, argv)
 }
 
 /* Wrapper around flex_main, so flex_main can be built as a library. */
-int 
+int
 main(argc, argv)
 	int argc;
 	char *argv[];
@@ -225,7 +225,7 @@ main(argc, argv)
 
 /* check_options - check user-specified options */
 
-void 
+void
 check_options()
 {
 	int i;
@@ -472,7 +472,7 @@ check_options()
  *    This routine does not return.
  */
 
-void 
+void
 flexend(exit_status)
 	int exit_status;
 
@@ -903,7 +903,7 @@ flexend(exit_status)
 
 /* flexinit - initialize flex */
 
-void 
+void
 flexinit(argc, argv)
 	int argc;
 	char **argv;
@@ -1433,7 +1433,7 @@ flexinit(argc, argv)
 
 /* readin - read in the rules section of the input file(s) */
 
-void 
+void
 readin()
 {
 	static char yy_stdinit[] = "FILE *yyin = stdin, *yyout = stdout;";
@@ -1455,7 +1455,7 @@ readin()
 	 * However, if the POSIXLY_CORRECT variable is set, then we quietly
 	 * make flex as posix-compatible as possible.  This is the
 	 * recommended behavior according to the GNU Coding Standards.
-	 * 
+	 *
 	 * Note: The posix option was added to flex to provide the posix
 	 * behavior of the repeat operator in regular expressions, e.g.,
 	 * `ab{3}'
@@ -1659,7 +1659,7 @@ readin()
 
 /* set_up_initial_allocations - allocate memory for internal tables */
 
-void 
+void
 set_up_initial_allocations()
 {
 	maximum_mns = (long_align ? MAXIMUM_MNS_LONG : MAXIMUM_MNS);
@@ -1739,7 +1739,7 @@ basename2(path, strip_ext)
 	return b;
 }
 
-void 
+void
 usage()
 {
 	FILE *f = stdout;
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 5ea7c8cb689..fca4da19308 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_main.c,v 1.32 2015/11/11 02:52:46 deraadt Exp $	 */
+/* $OpenBSD: rpc_main.c,v 1.33 2017/01/21 08:33:07 krw Exp $	 */
 /* $NetBSD: rpc_main.c,v 1.9 1996/02/19 11:12:43 pk Exp $	 */
 
 /*
@@ -141,7 +141,7 @@ main(int argc, char *argv[])
 	struct commandline cmd;
 
 	if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1) {
-		perror("pledge");		
+		perror("pledge");
 		exit(1);
 	}
 
diff --git a/usr.bin/rpcgen/rpc_scan.h b/usr.bin/rpcgen/rpc_scan.h
index 7f21471e499..7d81f0ba0e2 100644
--- a/usr.bin/rpcgen/rpc_scan.h
+++ b/usr.bin/rpcgen/rpc_scan.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_scan.h,v 1.6 2016/01/15 10:14:32 jasper Exp $	*/
+/*	$OpenBSD: rpc_scan.h,v 1.7 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: rpc_scan.h,v 1.3 1995/06/11 21:50:04 pk Exp $	*/
 
 /*
@@ -35,11 +35,11 @@
 /*      @(#)rpc_scan.h  1.3  90/08/29  (C) 1987 SMI   */
 
 /*
- * rpc_scan.h, Definitions for the RPCL scanner 
+ * rpc_scan.h, Definitions for the RPCL scanner
  */
 
 /*
- * kinds of tokens 
+ * kinds of tokens
  */
 enum tok_kind {
 	TOK_IDENT,
@@ -86,7 +86,7 @@ enum tok_kind {
 typedef enum tok_kind tok_kind;
 
 /*
- * a token 
+ * a token
  */
 struct token {
 	tok_kind kind;
@@ -96,7 +96,7 @@ typedef struct token token;
 
 
 /*
- * routine interface 
+ * routine interface
  */
 void scan(tok_kind, token *);
 void scan2(tok_kind, tok_kind, token *);
diff --git a/usr.bin/rpcgen/rpc_util.h b/usr.bin/rpcgen/rpc_util.h
index 2adad1ab37c..4218d7c1ae1 100644
--- a/usr.bin/rpcgen/rpc_util.h
+++ b/usr.bin/rpcgen/rpc_util.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_util.h,v 1.16 2015/08/20 22:32:41 deraadt Exp $	*/
+/*	$OpenBSD: rpc_util.h,v 1.17 2017/01/21 08:33:07 krw Exp $	*/
 /*	$NetBSD: rpc_util.h,v 1.3 1995/06/11 21:50:10 pk Exp $	*/
 
 /*
@@ -35,7 +35,7 @@
 /*      @(#)rpc_util.h  1.5  90/08/29  (C) 1987 SMI   */
 
 /*
- * rpc_util.h, Useful definitions for the RPC protocol compiler 
+ * rpc_util.h, Useful definitions for the RPC protocol compiler
  */
 
 struct list {
@@ -48,7 +48,7 @@ typedef struct list list;
 #define GET 2
 
 /*
- * Global variables 
+ * Global variables
  */
 #define MAXLINESIZE 1024
 extern char curline[MAXLINESIZE];
@@ -88,7 +88,7 @@ extern int timerflag;
 extern int nonfatalerrors;
 
 /*
- * rpc_util routines 
+ * rpc_util routines
  */
 void storeval(list **, definition *);
 
@@ -115,18 +115,18 @@ void record_open(char *);
 bas_type *find_type(char *);
 char *make_argname(char *, char *);
 /*
- * rpc_cout routines 
+ * rpc_cout routines
  */
 void emit(definition *);
 
 /*
- * rpc_hout routines 
+ * rpc_hout routines
  */
 void print_datadef(definition *);
 void print_funcdef(definition *);
 
 /*
- * rpc_svcout routines 
+ * rpc_svcout routines
  */
 void write_most(char *, int, int);
 void write_rest(void);
diff --git a/usr.sbin/amd/amq/amq.c b/usr.sbin/amd/amq/amq.c
index 9490d678141..972d4ef2c0b 100644
--- a/usr.sbin/amd/amq/amq.c
+++ b/usr.sbin/amd/amq/amq.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)amq.c	8.1 (Berkeley) 6/7/93
- *	$Id: amq.c,v 1.20 2016/12/20 22:19:08 krw Exp $
+ *	$Id: amq.c,v 1.21 2017/01/21 08:33:51 krw Exp $
  */
 
 /*
@@ -290,11 +290,11 @@ main(int argc, char *argv[])
 		if (unmount_flag)
 			errs = 1;
 	}
-	
+
 	if (errs) {
 show_usage:
 		fprintf(stderr, "usage: %s [-fmsuv] [-h hostname] "
-		    "[directory ...]\n", __progname);
+	    "[directory ...]\n", __progname);
 		exit(1);
 	}
 
@@ -523,7 +523,7 @@ show_usage:
 }
 
 /*
- * udpresport creates a datagram socket and attempts to bind it to a 
+ * udpresport creates a datagram socket and attempts to bind it to a
  * secure port.
  * returns: The bound socket, or -1 to indicate an error.
  */
diff --git a/usr.sbin/mopd/common/device.c b/usr.sbin/mopd/common/device.c
index 8aeb17b640e..5135f4dd05d 100644
--- a/usr.sbin/mopd/common/device.c
+++ b/usr.sbin/mopd/common/device.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: device.c,v 1.16 2013/11/24 21:32:31 deraadt Exp $ */
+/*	$OpenBSD: device.c,v 1.17 2017/01/21 08:33:51 krw Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -157,7 +157,7 @@ deviceInitOne(char *ifname)
 	snprintf(interface, sizeof(interface), "%s", ifname);
 #endif /* _AIX */
 
-	/* Ok, init it just once */	
+	/* Ok, init it just once */
 	p = iflist;
 	for (p = iflist; p; p = p->next)
 		if (strcmp(p->if_name, interface) == 0)
diff --git a/usr.sbin/mopd/common/dl.c b/usr.sbin/mopd/common/dl.c
index 76baa16fd83..3b7c616cde7 100644
--- a/usr.sbin/mopd/common/dl.c
+++ b/usr.sbin/mopd/common/dl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl.c,v 1.9 2016/12/25 16:40:06 krw Exp $ */
+/*	$OpenBSD: dl.c,v 1.10 2017/01/21 08:33:51 krw Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -15,9 +15,9 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
diff --git a/usr.sbin/mopd/common/file.c b/usr.sbin/mopd/common/file.c
index 170dded7d5f..65c016b3f95 100644
--- a/usr.sbin/mopd/common/file.c
+++ b/usr.sbin/mopd/common/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.17 2014/12/13 14:44:59 miod Exp $ */
+/*	$OpenBSD: file.c,v 1.18 2017/01/21 08:33:51 krw Exp $ */
 
 /*
  * Copyright (c) 1995-96 Mats O Jansson.  All rights reserved.
@@ -891,12 +891,12 @@ CheckAOutFile(int fd)
 		return(-1);
 
 	(void)lseek(fd, (off_t) 0, SEEK_SET);
-	
+
 	if (read(fd, (char *)&ex_swap, sizeof(ex_swap)) != sizeof(ex_swap))
 		return(-1);
 
 	(void)lseek(fd, (off_t) 0, SEEK_SET);
-	
+
 	mid = getMID(mid, N_GETMID (ex));
 
 	if (mid == -1) {
@@ -1227,7 +1227,7 @@ mopFileRead(struct dllist *dlslot, u_char *buf)
 		len = 0;
 
 		total = dlslot->a_text;
-		
+
 		if (pos < total) {
 			notdone = total - pos;
 			if (notdone <= bsz) {
@@ -1256,7 +1256,7 @@ mopFileRead(struct dllist *dlslot, u_char *buf)
 		}
 
 		total = total + dlslot->a_data;
-		
+
 		if ((bsz > 0) && (pos < total)) {
 			notdone = total - pos;
 			if (notdone <= bsz) {
@@ -1283,7 +1283,7 @@ mopFileRead(struct dllist *dlslot, u_char *buf)
 			pos = pos + outlen;
 			bsz = bsz - outlen;
 		}
-		
+
 		total = total + dlslot->a_bss;
 
 		if ((bsz > 0) && (pos < total)) {
@@ -1298,7 +1298,7 @@ mopFileRead(struct dllist *dlslot, u_char *buf)
 			pos = pos + outlen;
 			bsz = bsz - outlen;
 		}
-		
+
 		total = total + dlslot->a_bss_fill;
 
 		if ((bsz > 0) && (pos < total)) {
@@ -1313,7 +1313,7 @@ mopFileRead(struct dllist *dlslot, u_char *buf)
 			pos = pos + outlen;
 			bsz = bsz - outlen;
 		}
-		
+
 		dlslot->a_lseek = pos;
 		break;
 
diff --git a/usr.sbin/mopd/common/mopdef.h b/usr.sbin/mopd/common/mopdef.h
index 389656ce9f1..1ec3a8b99be 100644
--- a/usr.sbin/mopd/common/mopdef.h
+++ b/usr.sbin/mopd/common/mopdef.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopdef.h,v 1.5 2003/06/02 21:38:39 maja Exp $ */
+/*	$OpenBSD: mopdef.h,v 1.6 2017/01/21 08:33:51 krw Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: mopdef.h,v 1.5 2003/06/02 21:38:39 maja Exp $
+ *	$OpenBSD: mopdef.h,v 1.6 2017/01/21 08:33:51 krw Exp $
  *
  */
 
@@ -48,7 +48,7 @@
 
 /* The following constants are defined in module MOPDEF.SDL in MOM */
 
-#define MOP_K_CODE_MIN          0 
+#define MOP_K_CODE_MIN          0
 #define MOP_K_CODE_MLT          0       /* Memory Load with transfer address */
 #define MOP_K_CODE_DCM          1       /* Dump Complete */
 #define MOP_K_CODE_MLD          2       /* Memory Load */
@@ -71,38 +71,38 @@
 #define MOP_K_CODE_PLT          20      /* Parameter load with transfer address*/
 #define MOP_K_CODE_ALD          24      /* Active loop data */
 #define MOP_K_CODE_PLD          26      /* Passive looped data */
-#define MOP_K_CODE_MAX          26 
+#define MOP_K_CODE_MAX          26
 
-#define MOP_K_PGTY_MIN          0 
+#define MOP_K_PGTY_MIN          0
 #define MOP_K_PGTY_SECLDR       0       /* Secondary Loader */
 #define MOP_K_PGTY_TERLDR       1       /* Tertiary Loader */
 #define MOP_K_PGTY_OPRSYS       2       /* Operating System */
 #define MOP_K_PGTY_MGNTFL       3       /* Management File */
-#define MOP_K_PGTY_MAX          3 
+#define MOP_K_PGTY_MAX          3
 
-#define MOP_K_BPTY_MIN          0 
+#define MOP_K_BPTY_MIN          0
 #define MOP_K_BPTY_SYS          0       /* System Processor */
 #define MOP_K_BPTY_COM          1       /* Communication Processor */
 #define MOP_K_BPTY_MAX          1
 
-#define MOP_K_RML_ERROR_MIN     0 
+#define MOP_K_RML_ERROR_MIN     0
 #define MOP_K_RML_ERROR_NONE    0       /* None */
 #define MOP_K_RML_ERROR_NO_LOAD 1       /* Image data not properly loaded */
-#define MOP_K_RML_ERROR_MAX     1 
+#define MOP_K_RML_ERROR_MAX     1
 
-#define MOP_K_PLTP_MIN          0 
+#define MOP_K_PLTP_MIN          0
 #define MOP_K_PLTP_END          0       /* End Mark */
 #define MOP_K_PLTP_TSN          1       /* Target System Name */
 #define MOP_K_PLTP_TSA          2       /* Target System Address */
 #define MOP_K_PLTP_HSN          3       /* Host System Name */
 #define MOP_K_PLTP_HSA          4       /* Host System Address */
 #define MOP_K_PLTP_HST          5       /* Host System Time */
-#define MOP_K_PLTP_MAX          5 
+#define MOP_K_PLTP_MAX          5
 
-#define MOP_K_BOT_CNTL_MIN      0 
+#define MOP_K_BOT_CNTL_MIN      0
 #define MOP_K_BOT_CNTL_SERVER   0       /* Boot-Server */
 #define MOP_K_BOT_CNTL_DEVICE   1       /* Boot-Device */
-#define MOP_K_BOT_CNTL_MAX      1 
+#define MOP_K_BOT_CNTL_MAX      1
 
 #define MOP_K_INFO_VER          1       /* Maintenance Version */
 #define MOP_K_INFO_MFCT         2       /* Maintenance Functions */
@@ -118,26 +118,26 @@
 #define MOP_K_INFO_DLTY         400     /* Data Link Type */
 #define MOP_K_INFO_DLBSZ        401     /* Data Link Buffer Size */
 
-#define MOP_K_DLTY_MIN          1 
+#define MOP_K_DLTY_MIN          1
 #define MOP_K_DLTY_NI           1       /* Ethernet */
 #define MOP_K_DLTY_DDCMP        2       /* DDCMP */
 #define MOP_K_DLTY_LAPB         3       /* LAPB (frame level of X.25) */
-#define MOP_K_DLTY_MAX          3 
+#define MOP_K_DLTY_MAX          3
 
-#define MOP_K_PRTY_MIN          0 
+#define MOP_K_PRTY_MIN          0
 #define MOP_K_PRTY_11           1       /* PDP-11 (UNIBUS) */
 #define MOP_K_PRTY_CMSV         2       /* Communication Server */
 #define MOP_K_PRTY_PRO          3       /* Professional */
 #define MOP_K_PRTY_SCO          4       /* Scorpio */
 #define MOP_K_PRTY_AMB          5       /* Amber */
 #define MOP_K_PRTY_BRI          6       /* XLII Bridge */
-#define MOP_K_PRTY_MAX          6 
+#define MOP_K_PRTY_MAX          6
 
-#define MOP_K_SFID_FORM_MIN     -2 
+#define MOP_K_SFID_FORM_MIN     -2
 #define MOP_K_SFID_FORM_MAINT   -2      /* Maintenance System */
 #define MOP_K_SFID_FORM_OPRSYS  -1      /* Standard Operating System */
 #define MOP_K_SFID_FORM_NONE    0       /* None */
-#define MOP_K_SFID_FORM_MAX     0 
+#define MOP_K_SFID_FORM_MAX     0
 
 #define MOP_K_SFID_CUST         'CP'    /* Customer product */
 #define MOP_K_SFID_DEC          'DP'    /* DEC product */
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.c b/usr.sbin/mopd/mopa.out/mopa.out.c
index 9598907ba0e..e6471cd3c86 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.c
+++ b/usr.sbin/mopd/mopa.out/mopa.out.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopa.out.c,v 1.15 2016/12/20 22:19:08 krw Exp $ */
+/*	$OpenBSD: mopa.out.c,v 1.16 2017/01/21 08:33:51 krw Exp $ */
 
 /*
  * mopa.out - Convert a Unix format kernel into something that
@@ -10,10 +10,10 @@
  *
  * If necessary, the a.out header is stripped, and the program
  * segments are padded out. The BSS segment is zero filled.
- * A header is prepended that looks like an IHD header. In 
+ * A header is prepended that looks like an IHD header. In
  * particular the Unix machine ID is placed where mopd expects
  * the image type to be (offset is IHD_W_ALIAS). If the machine
- * ID could be mistaken for a DEC image type, then the conversion 
+ * ID could be mistaken for a DEC image type, then the conversion
  * is aborted. The original a.out header is copied into the front
  * of the header so that once we have detected the Unix machine
  * ID we can haul the load address and the xfer address out.
@@ -92,21 +92,21 @@ main (int argc, char **argv)
 	int	i, j;
 	struct dllist dl;
 	short image_type;
-	
+
 #ifdef NOAOUT
 	fprintf(stderr, "%s: has no function in OS/BSD\n", argv[0]);
 	return(1);
-#endif	
+#endif
 
 	if (argc != 3) {
 		fprintf (stderr, "usage: %s infile outfile\n", argv[0]);
 		return (1);
 	}
-	
+
 	dl.ldfd = open (argv[1], O_RDONLY);
 	if (dl.ldfd == -1)
 		err(2, "open `%s'", argv[1]);
-	
+
 	if (GetFileInfo(&dl, 0) == -1)
 		errx(3, "`%s' is an unknown file type", argv[1]);
 
@@ -192,13 +192,13 @@ main (int argc, char **argv)
 		mopFilePutLX(header, 0xd4 + EISD_L_SECSIZE, i, 4);
 		break;
 	}
-	
+
 	out = fopen (argv[2], "w");
 	if (!out)
 		err(2, "writing `%s'", argv[2]);
-	
+
 	/* Now we do the actual work. Write MOP-image header */
-	
+
 	fwrite (header, sizeof (header), 1, out);
 
 	switch (dl.image_type) {
@@ -229,11 +229,11 @@ main (int argc, char **argv)
 	default:
 		break;
 	}
-	
+
 	while ((i = mopFileRead(&dl,header)) > 0) {
 		(void)fwrite(header, i, 1, out);
 	}
-	
+
 	fclose (out);
 	exit(0);
 }
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 299fab4ef31..144fa558092 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -115,7 +115,7 @@ main(int argc, char *argv[])
     }
     argc -= optind;
     argv += optind;
-    
+
     if (argc > 0) {
 usage:	fprintf(stderr,
 		"usage: mrouted [-p] [-c config_file] [-d [debug_level]]\n");
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c
index b6fc3913c94..717c251c20c 100644
--- a/usr.sbin/mtrace/mtrace.c
+++ b/usr.sbin/mtrace/mtrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtrace.c,v 1.37 2016/08/03 23:37:25 krw Exp $	*/
+/*	$OpenBSD: mtrace.c,v 1.38 2017/01/21 08:33:51 krw Exp $	*/
 /*	$NetBSD: mtrace.c,v 1.5 1995/12/10 10:57:15 mycroft Exp $	*/
 
 /*
@@ -9,7 +9,7 @@
  * about packet rate and loss for each hop along the path.  It can
  * usually be invoked just as
  *
- * 	mtrace source
+ *	mtrace source
  *
  * to trace the route from that source to the local host for a default
  * group when only the route is desired and not group-specific packet
@@ -21,7 +21,7 @@
  * Xerox PARC).  It attempts to parallel in command syntax and output
  * format the unicast traceroute program written by Van Jacobson (LBL)
  * for the parts where that makes sense.
- * 
+ *
  * Copyright (c) 1998-2001.
  * The University of Southern California/Information Sciences Institute.
  * All rights reserved.
@@ -170,7 +170,7 @@ inet_name(u_int32_t addr)
 }
 
 
-u_int32_t 
+u_int32_t
 host_addr(char *name)
 {
     struct hostent *e = NULL;
@@ -261,7 +261,7 @@ flag_type(u_int type)
 	(void) snprintf(buf, sizeof buf, "Unknown error code %d", type);
 	return (buf);
     }
-}    
+}
 
 /*
  * If destination is on a local net, get the netmask, else set the
@@ -284,7 +284,7 @@ get_netmask(int s, u_int32_t dst)
 	return (retval);
     }
     for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
-	if (ifa->ifa_addr->sa_family != AF_INET) 
+	if (ifa->ifa_addr->sa_family != AF_INET)
              continue;
 	if_addr = ((struct sockaddr_in *)ifa->ifa_addr)->sin_addr.s_addr;
 	if_mask = ((struct sockaddr_in *)ifa->ifa_netmask)->sin_addr.s_addr;
@@ -973,7 +973,7 @@ fixup_stats(struct resp_buf *base, struct resp_buf *prev, struct resp_buf *new)
 	res = ((ntohl(n->tr_pktcnt) < ntohl(b->tr_pktcnt)) ||
 	       (ntohl(n->tr_pktcnt) < ntohl(p->tr_pktcnt)));
 	if (debug > 2)
-    	    printf("\t\tr=%d, res=%d\n", *r, res);
+	    printf("\t\tr=%d, res=%d\n", *r, res);
 	if (*r) {
 	    if (res || *r > 1) {
 		/*
@@ -1082,7 +1082,7 @@ print_stats(struct resp_buf *base, struct resp_buf *prev, struct resp_buf *new)
 	if (ttl < n->tr_fttl) ttl = n->tr_fttl;
 	else ++ttl;
     }
-	   
+
     printf("     %c      \\__   ttl%5d   ", first ? 'v' : '|', ttl);
     stat_line(p, n, FALSE, r);
     if (!first) {
@@ -1288,7 +1288,7 @@ usage: mtrace [-lMnpsv] [-g gateway] [-i if_addr] [-m max_hops] [-q nqueries]\n\
     }
 
 #ifdef SUNOS5
-    /*
+   /*
      * SunOS 5.X prior to SunOS 2.6, getsockname returns 0 for udp socket.
      * This call to sysinfo will return the hostname.
      * If the default multicast interface (set with the route
@@ -1299,7 +1299,7 @@ usage: mtrace [-lMnpsv] [-g gateway] [-i if_addr] [-m max_hops] [-q nqueries]\n\
 	char myhostname[HOST_NAME_MAX+1];
 	struct hostent *hp;
 	int error;
-    
+
 	error = sysinfo(SI_HOSTNAME, myhostname, sizeof(myhostname));
 	if (error == -1) {
 	    perror("Getting my hostname");
@@ -1347,7 +1347,7 @@ usage: mtrace [-lMnpsv] [-g gateway] [-i if_addr] [-m max_hops] [-q nqueries]\n\
     }
 
     /*
-     * If the response is to be a multicast address, make sure we 
+     * If the response is to be a multicast address, make sure we
      * are listening on that multicast address.
      */
     if (raddr) {
@@ -1386,7 +1386,7 @@ usage: mtrace [-lMnpsv] [-g gateway] [-i if_addr] [-m max_hops] [-q nqueries]\n\
 	hops = qno;
 	tries = nqueries;
 	printf("Querying reverse path, maximum %d hops... ", qno);
-	fflush(stdout); 
+	fflush(stdout);
     }
     base.rtime = 0;
     base.len = 0;
@@ -1462,7 +1462,7 @@ usage: mtrace [-lMnpsv] [-g gateway] [-i if_addr] [-m max_hops] [-q nqueries]\n\
 	    r = base.resps + base.len - 1;
 	    if (base.len == hops &&
 		(hops == 1 || (base.resps+nexthop-2)->tr_outaddr == lastout)) {
-	    	if (hops == nexthop) {
+		if (hops == nexthop) {
 		    print_trace(-hops, &base);
 		} else {
 		    printf("\nResuming...\n");
diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c
index 548d797d49e..54a0a5e3b1a 100644
--- a/usr.sbin/rpc.statd/procs.c
+++ b/usr.sbin/rpc.statd/procs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procs.c,v 1.2 2015/08/20 22:39:29 deraadt Exp $	*/
+/*	$OpenBSD: procs.c,v 1.3 2017/01/21 08:33:51 krw Exp $	*/
 
 /*
  * Copyright (c) 1995
@@ -143,7 +143,7 @@ sm_mon_1_svc(mon *arg, struct svc_req *req)
  *		In the unlikely event of more than one identical monitor
  *		request, all are removed.
  */
-int 
+int
 do_unmon(char *name, HostInfo *hp, void *ptr)
 {
 	my_id *idp = ptr;
diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c
index cf9624d63ab..46bc1343513 100644
--- a/usr.sbin/rpc.statd/statd.c
+++ b/usr.sbin/rpc.statd/statd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: statd.c,v 1.3 2017/01/20 01:12:44 krw Exp $	*/
+/*	$OpenBSD: statd.c,v 1.4 2017/01/21 08:33:51 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -58,8 +58,8 @@
 #include "statd.h"
 
 struct sigaction sa;
-int     	debug = 0;		/* Controls syslog() for debug msgs */
-int     	_rpcsvcdirty = 0;	/* XXX ??? */
+int		debug = 0;		/* Controls syslog() for debug msgs */
+int		_rpcsvcdirty = 0;	/* XXX ??? */
 static DB	*db;			/* Database file */
 
 Header		 status_info;
@@ -176,7 +176,7 @@ main(int argc, char **argv)
  *		of SM_NOTIFY to other systems, so it is normal for the
  *		children to exit when they have done their work.
  */
-void 
+void
 notify_handler(int sig)
 {
 	time_t now;
@@ -206,7 +206,7 @@ notify_handler(int sig)
  * Purpose:	Packaged call of msync() to flush changes to mmap()ed file
  * Returns:	Nothing.  Errors to syslog.
  */
-void 
+void
 sync_file()
 {
 	DBT data;
@@ -308,7 +308,7 @@ bad:
 /*
  * Purpose:	Call the given function if the element is valid
  * Returns:	Nothing - exits on error
- * Notes:	
+ * Notes:
  */
 static int
 walk_one(int (*fun)(DBT *, HostInfo *, void *), DBT *key, DBT *data, void *ptr)
@@ -329,7 +329,7 @@ walk_one(int (*fun)(DBT *, HostInfo *, void *), DBT *key, DBT *data, void *ptr)
 /*
  * Purpose:	Iterate over all elements calling the given function
  * Returns:	-1 if function failed, 0 on success
- * Notes:	
+ * Notes:
  */
 static int
 walk_db(int (*fun)(DBT *, HostInfo *, void *), void *ptr)
@@ -379,7 +379,7 @@ bad:
  *		that the host was previously monitored is recorded by
  *		setting the notifyReqd flag, which will in due course
  *		cause a SM_NOTIFY to be sent.
- *		 
+ *
  *		Note that if we crash twice in quick succession, some hosts
  *		may already have notifyReqd set, where we didn't manage to
  *		notify them before the second crash occurred.
@@ -400,7 +400,7 @@ reset_host(DBT *key, HostInfo *hi, void *ptr)
 /*
  * Purpose:	Check if there is work to be done.
  * Returns:	0 if there is no work to be done -1 if there is.
- * Notes:	
+ * Notes:
  */
 static int
 check_work(DBT *key, HostInfo *hi, void *ptr)
@@ -412,7 +412,7 @@ check_work(DBT *key, HostInfo *hi, void *ptr)
 /*
  * Purpose:	Unmonitor a host
  * Returns:	0
- * Notes:	
+ * Notes:
  */
 static int
 unmon_host(DBT *key, HostInfo *hi, void *ptr)
@@ -428,7 +428,7 @@ unmon_host(DBT *key, HostInfo *hi, void *ptr)
 /*
  * Purpose:	Notify one host.
  * Returns:	0 if success -1 on failure
- * Notes:	
+ * Notes:
  */
 static int
 notify_one(DBT *key, HostInfo *hi, void *ptr)
@@ -487,12 +487,12 @@ notify_one(DBT *key, HostInfo *hi, void *ptr)
  *		all hosts that had a monitor list, and incrementing
  *		the state number to the next even value.
  */
-static void 
+static void
 init_file(char *filename)
 {
 	DBT data;
 
-	db = dbopen(filename, O_RDWR|O_CREAT|O_NDELAY|O_EXLOCK, 0644, DB_HASH, 
+	db = dbopen(filename, O_RDWR|O_CREAT|O_NDELAY|O_EXLOCK, 0644, DB_HASH,
 	    NULL);
 	if (db == NULL)
 		err(1, "Cannot open `%s'", filename);
@@ -553,7 +553,7 @@ unmon_hosts(void)
 	sync_file();
 }
 
-static int 
+static int
 notify_one_host(char *hostname)
 {
 	struct timeval timeout = {20, 0};	/* 20 secs timeout */
diff --git a/usr.sbin/rpc.statd/test.c b/usr.sbin/rpc.statd/test.c
index c0aad1e8482..749166aa10d 100644
--- a/usr.sbin/rpc.statd/test.c
+++ b/usr.sbin/rpc.statd/test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: test.c,v 1.1 2008/06/15 04:43:28 sturm Exp $	*/
+/*	$OpenBSD: test.c,v 1.2 2017/01/21 08:33:51 krw Exp $	*/
 
 #include <stdio.h>
 #include <rpc/rpc.h>
@@ -83,7 +83,7 @@ sm_simu_crash_1(argp, clnt)
 }
 
 
-int 
+int
 main(argc, argv)
 	int argc;
 	char **argv;