Nuke whitespace foolish enough to expose itself during the great

"warning:" rectification.

16 files changed, 70 insertions, 70 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);