am 8e1ee7fd: merge from open-source master

libc/stdio/findfp.c

@@ -50,7 +50,7 @@ int	__sdidinit;
 /*	 p r w flags file _bf z  cookie      close    read    seek    write
 	 ext */
 
-				/* the usual - (stdin + stdout + stderr) */
+/* the usual - (stdin + stdout + stderr) */
 static FILE usual[FOPEN_MAX - 3];
 static struct __sfileext usualext[FOPEN_MAX - 3];
 static struct glue uglue = { 0, FOPEN_MAX - 3, usual };

libc/stdio/putchar.c

@@ -42,7 +42,7 @@ putchar_unlocked(int c)
 {
 	FILE *so = stdout;
 
-	return (putc_unlocked(c,so));
+	return (putc_unlocked(c, so));
 }
 
 #undef putchar

libc/stdio/vsscanf.c

@@ -39,7 +39,6 @@
 static int
 eofread(void *cookie, char *buf, int len)
 {
-
 	return (0);
 }