Wall and spacing, I am hunting bugs

6 files changed, 23 insertions, 22 deletions

diff --git a/usr.sbin/config/cmd.c b/usr.sbin/config/cmd.c
index 7bec41fb910..0f9210027ec 100644
--- a/usr.sbin/config/cmd.c
+++ b/usr.sbin/config/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.10 2003/06/02 21:19:03 maja Exp $ */
+/*	$OpenBSD: cmd.c,v 1.11 2004/01/04 00:47:01 deraadt Exp $ */
 
 /*
  * Copyright (c) 1999-2001 Mats O Jansson.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: cmd.c,v 1.10 2003/06/02 21:19:03 maja Exp $";
+static char rcsid[] = "$OpenBSD: cmd.c,v 1.11 2004/01/04 00:47:01 deraadt Exp $";
 #endif
 
 #include <sys/types.h>
@@ -302,7 +302,7 @@ int_variable_adjust(const cmd_t *cmd, int idx, const char *name)
 				printf("Unknown argument\n");
 		}
 	} else
-		printf("This kernel does not support modification of %s.\n", 
+		printf("This kernel does not support modification of %s.\n",
 		    name);
 }
 
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 8dc3a8ac3f9..640d8f38164 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.19 2003/06/02 23:36:52 millert Exp $	*/
+/*	$OpenBSD: config.h,v 1.20 2004/01/04 00:47:01 deraadt Exp $	*/
 /*	$NetBSD: config.h,v 1.30 1997/02/02 21:12:30 thorpej Exp $	*/
 
 /*
@@ -192,7 +192,7 @@ struct devi {
 	int	i_lineno;	/* line # in config, for later errors */
 
 	/* created during packing or ioconf.c generation */
-/* 		i_loclen	   via i_atattr->a_loclen */
+/*		i_loclen	   via i_atattr->a_loclen */
 	short	i_collapsed;	/* set => this alias no longer needed */
 	short	i_cfindex;	/* our index in cfdata */
 	short	i_pvlen;	/* number of parents */
diff --git a/usr.sbin/config/gram.y b/usr.sbin/config/gram.y
index 073286088bb..5b5578271c9 100644
--- a/usr.sbin/config/gram.y
+++ b/usr.sbin/config/gram.y
@@ -1,5 +1,5 @@
 %{
-/*	$OpenBSD: gram.y,v 1.17 2003/06/28 04:55:07 deraadt Exp $	*/
+/*	$OpenBSD: gram.y,v 1.18 2004/01/04 00:47:01 deraadt Exp $	*/
 /*	$NetBSD: gram.y,v 1.14 1997/02/02 21:12:32 thorpej Exp $	*/
 
 /*
@@ -158,7 +158,7 @@ topthing:
 
 machine_spec:
 	XMACHINE WORD '\n'		{ setmachine($2,NULL); } |
-	XMACHINE WORD WORD '\n' 	{ setmachine($2,$3); } |
+	XMACHINE WORD WORD '\n'		{ setmachine($2,$3); } |
 	error { stop("cannot proceed without machine specifier"); };
 
 dev_eof:
@@ -234,7 +234,7 @@ one_def:
 	ATTACH devbase AT atlist devattach_opt attrs_opt
 					{ defdevattach($5, $2, $4, $6); } |
 	MAXUSERS NUMBER NUMBER NUMBER	{ setdefmaxusers($2, $3, $4); } |
-	MAXPARTITIONS NUMBER 		{ maxpartitions = $2; } |
+	MAXPARTITIONS NUMBER		{ maxpartitions = $2; } |
 	PSEUDO_DEVICE devbase attrs_opt { defdev($2,1,NULL,$3); } |
 	MAJOR '{' majorlist '}';
 
@@ -272,7 +272,7 @@ loclist:
 
 /* "[ WORD locdefault ]" syntax may be unnecessary... */
 locdef:
-	WORD locdefault 		{ $$ = new_nsi($1, $2, 0); } |
+	WORD locdefault			{ $$ = new_nsi($1, $2, 0); } |
 	WORD				{ $$ = new_nsi($1, NULL, 0); } |
 	'[' WORD locdefault ']'		{ $$ = new_nsi($2, $3, 1); };
 
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 7865f57871f..48cb7aea2cb 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.34 2003/12/29 05:26:11 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.35 2004/01/04 00:47:01 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.22 1997/02/02 21:12:33 thorpej Exp $	*/
 
 /*
@@ -53,6 +53,7 @@ static char copyright[] =
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
+#include <err.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/usr.sbin/config/pack.c b/usr.sbin/config/pack.c
index ad488603b6e..2d9c1db512f 100644
--- a/usr.sbin/config/pack.c
+++ b/usr.sbin/config/pack.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pack.c,v 1.14 2003/06/28 04:55:07 deraadt Exp $	*/
+/*	$OpenBSD: pack.c,v 1.15 2004/01/04 00:47:01 deraadt Exp $	*/
 /*	$NetBSD: pack.c,v 1.5 1996/08/31 21:15:11 mycroft Exp $	*/
 
 /*
@@ -345,14 +345,14 @@ packpvec(void)
 	qsort(packed, npacked, sizeof *packed, pvlencmp);
 	for (p = packed; (i = *p) != NULL; p++) {
 		l = i->i_pvlen;
-if (l > longest_pvec) panic("packpvec");
+		if (l > longest_pvec)
+			panic("packpvec");
 		par = i->i_parents;
 		for (v = 0; v < l; v++)
 			vec[v] = par[v]->i_cfindex;
-		if (l == 0 ||
-		    (o = findvec(vec, PVHASH(vec[l - 1]), l,
-			    samepv, parents.used)) < 0)
-		    	o = addpv(vec, l);
+		if (l == 0 || (o = findvec(vec, PVHASH(vec[l - 1]), l,
+		    samepv, parents.used)) < 0)
+			o = addpv(vec, l);
 		i->i_pvoff = o;
 	}
 	free(vec);
diff --git a/usr.sbin/config/ukc.c b/usr.sbin/config/ukc.c
index 0d59aa53eb5..f8147f742fe 100644
--- a/usr.sbin/config/ukc.c
+++ b/usr.sbin/config/ukc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukc.c,v 1.11 2003/06/28 04:55:07 deraadt Exp $ */
+/*	$OpenBSD: ukc.c,v 1.12 2004/01/04 00:47:01 deraadt Exp $ */
 
 /*
  * Copyright (c) 1999-2001 Mats O Jansson.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ukc.c,v 1.11 2003/06/28 04:55:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ukc.c,v 1.12 2004/01/04 00:47:01 deraadt Exp $";
 #endif
 
 #include <sys/types.h>
@@ -228,7 +228,7 @@ init(void)
 	if ((s = getenv("LINES")) != NULL)
 		sc_height = atoi(s);
 	else
- 		sc_height = tgetnum("li");
+		sc_height = tgetnum("li");
 
 	if (sc_height <= 0)
 		sc_height = 24;
@@ -236,9 +236,9 @@ init(void)
 	if ((s = getenv("COLUMNS")) != NULL)
 		sc_width = atoi(s);
 	else
- 		sc_width = tgetnum("co");
+		sc_width = tgetnum("co");
 
- 	if (sc_width <= 0)
-  		sc_width = 80;
+	if (sc_width <= 0)
+		sc_width = 80;
 #endif
 }