Nuke whitespace foolish enough to expose itself during the great

"warning:" rectification.

5 files changed, 46 insertions, 46 deletions

diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index f74392cff80..758f2f7faeb 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifconfig.c,v 1.336 2016/12/25 20:30:41 krw Exp $	*/
+/*	$OpenBSD: ifconfig.c,v 1.337 2017/01/21 08:31:44 krw Exp $	*/
 /*	$NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $	*/
 
 /*
@@ -1891,7 +1891,7 @@ setifwpakey(const char *val, int d)
 			if (val == NULL || passlen != sizeof(psk.i_psk))
 				errx(1, "wpakey: invalid pre-shared key");
 		} else {
-			/* Parse a WPA passphrase */ 
+			/* Parse a WPA passphrase */
 			if (passlen < 8 || passlen > 63)
 				errx(1, "wpakey: passphrase must be between "
 				    "8 and 63 characters");
@@ -3094,7 +3094,7 @@ status(int link, struct sockaddr_dl *sdl, int ls)
 			for (i = 0, printed_type = 0; i < ifmr.ifm_count; i++) {
 				if (IFM_TYPE(media_list[i]) == type) {
 
-					/* 
+					/*
 					 * Don't advertise media with fixed
 					 * data rates for wireless interfaces.
 					 * Normal people don't need these.
@@ -4444,7 +4444,7 @@ pflow_status(void)
 	case AF_INET:
 		sin = (struct sockaddr_in*)&preq.flowdst;
 		printf("receiver: %s:", sin->sin_addr.s_addr != INADDR_ANY ?
-		    buf : "INVALID");	
+		    buf : "INVALID");
 		if (sin->sin_port == 0)
 			printf("%s ", "INVALID");
 		else
@@ -4454,7 +4454,7 @@ pflow_status(void)
 		sin6 = (struct sockaddr_in6*) &preq.flowdst;
 		printf("receiver: [%s]:",
 		    !IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr) ? buf :
-		    "INVALID");	
+		    "INVALID");
 		if (sin6->sin6_port == 0)
 			printf("%s ", "INVALID");
 		else
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index d42c7c4c493..145a3a03d75 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.12 2014/09/07 19:43:35 guenther Exp $	*/
+/*	$OpenBSD: extern.h,v 1.13 2017/01/21 08:31:44 krw Exp $	*/
 /*	$NetBSD: extern.h,v 1.4 1995/03/18 14:59:43 cgd Exp $	*/
 
 /*-
@@ -35,9 +35,9 @@
 struct entry	*addentry(char *, ino_t, int);
 long		 addfile(char *, ino_t, int);
 void		 badentry(struct entry *, char *);
-void	 	 canon(char *, char *, size_t);
+void		 canon(char *, char *, size_t);
 void		 checkrestore(void);
-void 		 cleanup(void);
+void		 cleanup(void);
 void		 closemt(void);
 void		 createfiles(void);
 void		 createleaves(char *);
@@ -46,18 +46,18 @@ long		 deletefile(char *, ino_t, int);
 void		 deleteino(ino_t);
 ino_t		 dirlookup(const char *);
 void		 dumpsymtable(char *, long);
-void	 	 extractdirs(int);
+void		 extractdirs(int);
 int		 extractfile(char *);
 void		 findunreflinks(void);
 char		*flagvalues(struct entry *);
 void		 freeentry(struct entry *);
 void		 freename(char *);
-int	 	 genliteraldir(char *, ino_t);
+int		 genliteraldir(char *, ino_t);
 char		*gentempname(struct entry *);
 void		 getfile(void (*)(char *, size_t), void (*)(char *, size_t));
 void		 getvol(long);
 void		 initsymtable(char *);
-int	 	 inodetype(ino_t);
+int		 inodetype(ino_t);
 int		 linkit(char *, char *, int);
 struct entry	*lookupino(ino_t);
 struct entry	*lookupname(char *);
@@ -71,7 +71,7 @@ char		*myname(struct entry *);
 void		 newnode(struct entry *);
 void		 newtapebuf(long);
 long		 nodeupdates(char *, ino_t, int);
-void	 	 onintr(int);
+void		 onintr(int);
 void		 panic(const char *, ...)
 		    __attribute__((__format__ (printf, 1, 2)));
 void		 pathcheck(char *);
@@ -86,15 +86,15 @@ int		 reply(char *);
 RST_DIR		*rst_opendir(const char *);
 struct direct	*rst_readdir(RST_DIR *);
 void		 rst_closedir(RST_DIR *dirp);
-void	 	 runcmdshell(void);
+void		 runcmdshell(void);
 char		*savename(char *);
-void	 	 setdirmodes(int);
+void		 setdirmodes(int);
 void		 setinput(char *);
 void		 setup(void);
-void	 	 skipdirs(void);
+void		 skipdirs(void);
 void		 skipfile(void);
 void		 skipmaps(void);
-void	 	 treescan(char *, ino_t, long (*)(char *, ino_t, int));
+void		 treescan(char *, ino_t, long (*)(char *, ino_t, int));
 ino_t		 upperbnd(ino_t);
 long		 verifyfile(char *, ino_t, int);
 void		 xtrnull(char *, size_t);
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 1d96349db48..dbe84fc797e 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.25 2016/07/28 21:37:10 tedu Exp $	*/
+/*	$OpenBSD: main.c,v 1.26 2017/01/21 08:31:44 krw Exp $	*/
 /*	$NetBSD: main.c,v 1.13 1997/07/01 05:37:51 lukem Exp $	*/
 
 /*
@@ -60,7 +60,7 @@ char	*usedinomap;
 ino_t	maxino;
 time_t	dumptime;
 time_t	dumpdate;
-FILE 	*terminal;
+FILE	*terminal;
 char	*tmpdir;
 
 static void obsolete(int *, char **[]);
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index 2e27d27a446..714830e9a3c 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: restore.h,v 1.8 2010/07/20 20:47:13 miod Exp $	*/
+/*	$OpenBSD: restore.h,v 1.9 2017/01/21 08:31:44 krw Exp $	*/
 /*	$NetBSD: restore.h,v 1.8 1997/07/01 05:37:54 lukem Exp $	*/
 
 /*
@@ -51,8 +51,8 @@ extern int	yflag;		/* always try to recover from tape errors */
 /*
  * Global variables
  */
-extern char	*dumpmap; 	/* map of inodes on this dump tape */
-extern char	*usedinomap; 	/* map of inodes that are in use on this fs */
+extern char	*dumpmap;	/* map of inodes on this dump tape */
+extern char	*usedinomap;	/* map of inodes that are in use on this fs */
 extern ino_t	maxino;		/* highest numbered inode in this file system */
 extern long	dumpnum;	/* location of the dump on this tape */
 extern long	volno;		/* current volume being read */
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index e6033851fce..78511e2aa48 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tape.c,v 1.48 2016/12/26 23:43:52 krw Exp $	*/
+/*	$OpenBSD: tape.c,v 1.49 2017/01/21 08:31:44 krw Exp $	*/
 /*	$NetBSD: tape.c,v 1.26 1997/04/15 07:12:25 lukem Exp $	*/
 
 /*
@@ -392,32 +392,32 @@ gethdr:
 	}
 	tapesread |= 1 << volno;
 	blksread = savecnt;
- 	/*
- 	 * If continuing from the previous volume, skip over any
- 	 * blocks read already at the end of the previous volume.
- 	 *
- 	 * If coming to this volume at random, skip to the beginning
- 	 * of the next record.
- 	 */
+	/*
+	 * If continuing from the previous volume, skip over any
+	 * blocks read already at the end of the previous volume.
+	 *
+	 * If coming to this volume at random, skip to the beginning
+	 * of the next record.
+	 */
 	Dprintf(stdout, "read %ld recs, tape starts with %lld\n",
 		tpblksread, tmpbuf.c_firstrec);
- 	if (tmpbuf.c_type == TS_TAPE && (tmpbuf.c_flags & DR_NEWHEADER)) {
- 		if (!wantnext) {
- 			tpblksread = tmpbuf.c_firstrec;
- 			for (i = tmpbuf.c_count; i > 0; i--)
- 				readtape(buf);
- 		} else if (tmpbuf.c_firstrec > 0 &&
+	if (tmpbuf.c_type == TS_TAPE && (tmpbuf.c_flags & DR_NEWHEADER)) {
+		if (!wantnext) {
+			tpblksread = tmpbuf.c_firstrec;
+			for (i = tmpbuf.c_count; i > 0; i--)
+				readtape(buf);
+		} else if (tmpbuf.c_firstrec > 0 &&
 			   tmpbuf.c_firstrec < tpblksread - 1) {
 			/*
 			 * -1 since we've read the volume header
 			 */
- 			i = tpblksread - tmpbuf.c_firstrec - 1;
+			i = tpblksread - tmpbuf.c_firstrec - 1;
 			Dprintf(stderr, "Skipping %ld duplicate record%s.\n",
 				i, (i == 1) ? "" : "s");
- 			while (--i >= 0)
- 				readtape(buf);
- 		}
- 	}
+			while (--i >= 0)
+				readtape(buf);
+		}
+	}
 	if (curfile.action == USING) {
 		if (volno == 1)
 			panic("active file into volume 1\n");
@@ -1061,7 +1061,7 @@ good:
 			buf->c_birthtimensec = 0;
 			buf->c_atimensec = buf->c_mtimensec = 0;
 		}
-			
+
 	case TS_ADDR:
 		break;
 
@@ -1073,7 +1073,7 @@ good:
 	buf->c_magic = FS_UFS2_MAGIC;
 
 	/*
-	 * If we are restoring a filesystem with old format inodes, 
+	 * If we are restoring a filesystem with old format inodes,
 	 * copy the uid/gid to the new location.
 	 */
 	if (oldinofmt) {
@@ -1099,10 +1099,10 @@ accthdr(struct s_spcl *header)
 	if (header->c_type == TS_TAPE) {
 		fprintf(stderr, "Volume header (%s inode format) ",
 		    oldinofmt ? "old" : "new");
- 		if (header->c_firstrec)
- 			fprintf(stderr, "begins with record %lld",
- 				(long long)header->c_firstrec);
- 		fprintf(stderr, "\n");
+		if (header->c_firstrec)
+			fprintf(stderr, "begins with record %lld",
+				(long long)header->c_firstrec);
+		fprintf(stderr, "\n");
 		previno = (ino_t)-1;
 		return;
 	}