spacing

6 files changed, 16 insertions, 23 deletions

diff --git a/usr.bin/mg/autoexec.c b/usr.bin/mg/autoexec.c
index f8db24b4027..4b9969157f0 100644
--- a/usr.bin/mg/autoexec.c
+++ b/usr.bin/mg/autoexec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoexec.c,v 1.4 2004/07/22 01:25:24 vincent Exp $ */
+/* $OpenBSD: autoexec.c,v 1.5 2005/03/10 16:58:57 deraadt Exp $ */
 /* this file is in the public domain */
 /* Author: Vincent Labrecque <vincent@openbsd.org>	April 2002 */
 
@@ -39,10 +39,6 @@ find_autoexec(const char *fname)
 	SLIST_FOREACH(ae, &autos, next) {
 		if (fnmatch(ae->pattern, fname, 0) == 0) {
 			if (used >= have) {
-				/*
-				 * XXX - realloc(NULL, ...) is not really
-				 *       portable
-				 */
 				npfl = realloc(pfl, (have + 8 + 1) * sizeof(PF));
 				if (npfl == NULL)
 					panic("out of memory");
diff --git a/usr.bin/mg/basic.c b/usr.bin/mg/basic.c
index 008fbd757bc..8908b012013 100644
--- a/usr.bin/mg/basic.c
+++ b/usr.bin/mg/basic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: basic.c,v 1.16 2004/07/22 01:25:24 vincent Exp $	*/
+/*	$OpenBSD: basic.c,v 1.17 2005/03/10 16:58:57 deraadt Exp $	*/
 
 /*
  *		Basic cursor motion commands.
@@ -208,7 +208,7 @@ backline(int f, int n)
 void
 setgoal(void)
 {
-	curgoal = getcolpos();		/* Get the position.     */
+	curgoal = getcolpos();		/* Get the position. */
 	/* we can now display past end of display, don't chop! */
 }
 
diff --git a/usr.bin/mg/buffer.c b/usr.bin/mg/buffer.c
index 0d533ffd1ba..d287ad92d73 100644
--- a/usr.bin/mg/buffer.c
+++ b/usr.bin/mg/buffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buffer.c,v 1.35 2005/03/09 16:20:48 jfb Exp $	*/
+/*	$OpenBSD: buffer.c,v 1.36 2005/03/10 16:58:57 deraadt Exp $	*/
 
 /*
  *		Buffer handling.
@@ -383,8 +383,8 @@ int
 anycb(int f)
 {
 	BUFFER *bp;
-	int     s = FALSE, save = FALSE;
-	char    prompt[NFILEN + 11];
+	int s = FALSE, save = FALSE;
+	char prompt[NFILEN + 11];
 
 	for (bp = bheadp; bp != NULL; bp = bp->b_bufp) {
 		if (bp->b_fname != NULL && *(bp->b_fname) != '\0' &&
@@ -575,9 +575,8 @@ bufferinsert(int f, int n)
 {
 	BUFFER *bp;
 	LINE   *clp;
-	int     clo;
-	int     nline;
-	char    bufn[NBUFN], *bufp;
+	int	clo, nline;
+	char	bufn[NBUFN], *bufp;
 
 	/* Get buffer to use from user */
 	if (curbp->b_altb != NULL)
diff --git a/usr.bin/mg/echo.c b/usr.bin/mg/echo.c
index 203d0f1fe6a..db300c0082e 100644
--- a/usr.bin/mg/echo.c
+++ b/usr.bin/mg/echo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: echo.c,v 1.29 2004/07/22 01:25:24 vincent Exp $	*/
+/*	$OpenBSD: echo.c,v 1.30 2005/03/10 16:58:57 deraadt Exp $	*/
 /*
  *	Echo line reading and writing.
  *
@@ -301,7 +301,7 @@ veread(const char *fp, char *buf, size_t nbuf, int flag, va_list ap)
 		case CCHR('Q'):			/* quote next */
 			c = getkey(FALSE);
 			/* FALLTHROUGH */
-		default:		
+		default:
 			/* all the rest */
 			if (dynbuf && cpos + 1 >= nbuf) {
 				void *newp;
diff --git a/usr.bin/mg/extend.c b/usr.bin/mg/extend.c
index 2f59f53b050..81d28993e07 100644
--- a/usr.bin/mg/extend.c
+++ b/usr.bin/mg/extend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extend.c,v 1.31 2004/07/22 01:25:25 vincent Exp $	*/
+/*	$OpenBSD: extend.c,v 1.32 2005/03/10 16:58:57 deraadt Exp $	*/
 
 /*
  *	Extended (M-X) commands, rebinding, and	startup file processing.
@@ -85,11 +85,9 @@ insert(int f, int n)
  */
 static int
 remap(KEYMAP *curmap,		/* pointer to the map being changed */
-      int c,			/* character being changed */
-      PF funct,			/* function being changed to */
-      KEYMAP *pref_map		/* if funct==NULL, map to bind to or
-				   NULL for new */
-      )
+    int c,			/* character being changed */
+    PF funct,			/* function being changed to */
+    KEYMAP *pref_map)		/* if funct==NULL, map to bind to or NULL for new */
 {
 	int		 i, n1, n2, nold;
 	KEYMAP		*mp, *newmap;
diff --git a/usr.bin/mg/fileio.c b/usr.bin/mg/fileio.c
index 91b3cc72444..e9dd02c6c64 100644
--- a/usr.bin/mg/fileio.c
+++ b/usr.bin/mg/fileio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fileio.c,v 1.47 2005/03/10 16:46:24 henning Exp $	*/
+/*	$OpenBSD: fileio.c,v 1.48 2005/03/10 16:58:57 deraadt Exp $	*/
 
 /*
  *	POSIX fileio.c
@@ -109,7 +109,7 @@ ffputbuf(BUFFER *bp)
 		}
 		if (lforw(lp) != lpend)		/* no implied \n on last line */
 			putc('\n', ffp);
-	}	
+	}
 	/*
 	 * XXX should be variable controlled (once we have variables)
 	 */