KNF

6 files changed, 30 insertions, 30 deletions

diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 88032eaa648..e0f88697f83 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl.c,v 1.201 2004/02/10 17:53:37 henning Exp $ */
+/*	$OpenBSD: pfctl.c,v 1.202 2004/02/10 22:26:55 dhartmei Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -65,7 +65,7 @@ int	 pfctl_clear_src_nodes(int, int);
 int	 pfctl_clear_states(int, int);
 int	 pfctl_kill_states(int, int);
 int	 pfctl_get_pool(int, struct pf_pool *, u_int32_t, u_int32_t, int,
-	     char *, char *);
+	    char *, char *);
 void	 pfctl_print_rule_counters(struct pf_rule *, int);
 int	 pfctl_show_rules(int, int, int, char *, char *);
 int	 pfctl_show_nat(int, int, char *, char *);
@@ -1022,12 +1022,12 @@ pfctl_rules(int dev, char *filename, int opts, char *anchorname,
 #define ERR(x) do { warn(x); goto _error; } while(0)
 #define ERRX(x) do { warnx(x); goto _error; } while(0)
 
-	FILE *fin;
-	struct pfr_buffer      *t, buf;
-	struct pfioc_altq	pa;
-	struct pfctl		pf;
-	struct pfr_table	trs;
-	int			osize;
+	FILE			*fin;
+	struct pfr_buffer	*t, buf;
+	struct pfioc_altq	 pa;
+	struct pfctl		 pf;
+	struct pfr_table	 trs;
+	int			 osize;
 
 	if (trans == NULL) {
 	    bzero(&buf, sizeof(buf));
diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h
index 9267d4c5183..25eb3d8a77c 100644
--- a/sbin/pfctl/pfctl.h
+++ b/sbin/pfctl/pfctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl.h,v 1.30 2004/01/29 01:25:13 mcbride Exp $ */
+/*	$OpenBSD: pfctl.h,v 1.31 2004/02/10 22:26:56 dhartmei Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -58,7 +58,7 @@ int	 pfr_clr_addrs(struct pfr_table *, int *, int);
 int	 pfr_add_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int);
 int	 pfr_del_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int);
 int	 pfr_set_addrs(struct pfr_table *, struct pfr_addr *, int, int *,
-	     int *, int *, int *, int);
+	    int *, int *, int *, int);
 int	 pfr_get_addrs(struct pfr_table *, struct pfr_addr *, int *, int);
 int	 pfr_get_astats(struct pfr_table *, struct pfr_astats *, int *, int);
 int	 pfr_clr_astats(struct pfr_table *, struct pfr_addr *, int, int *, int);
@@ -75,8 +75,8 @@ int	 pfr_buf_grow(struct pfr_buffer *, int);
 int	 pfr_buf_load(struct pfr_buffer *, char *, int,
 	    int (*)(struct pfr_buffer *, char *, int));
 char	*pfr_strerror(int);
-int      pfi_get_ifaces(const char *, struct pfi_if *, int *, int);
-int      pfi_clr_istats(const char *, int *, int);
+int	 pfi_get_ifaces(const char *, struct pfi_if *, int *, int);
+int	 pfi_clr_istats(const char *, int *, int);
 
 void	 pfctl_print_title(char *);
 int	 pfctl_clear_tables(const char *, const char *, int);
diff --git a/sbin/pfctl/pfctl_altq.c b/sbin/pfctl/pfctl_altq.c
index 00706f9e38d..5b892f823de 100644
--- a/sbin/pfctl/pfctl_altq.c
+++ b/sbin/pfctl/pfctl_altq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_altq.c,v 1.80 2004/02/10 17:53:37 henning Exp $	*/
+/*	$OpenBSD: pfctl_altq.c,v 1.81 2004/02/10 22:26:56 dhartmei Exp $	*/
 
 /*
  * Copyright (c) 2002
@@ -723,7 +723,7 @@ eval_pfqueue_hfsc(struct pfctl *pf, struct pf_altq *pa)
 		/* if the class has a real-time service curve, add it. */
 		if (opts->rtsc_m2 != 0 && altq->pq_u.hfsc_opts.rtsc_m2 != 0) {
 			sc.m1 = altq->pq_u.hfsc_opts.rtsc_m1;
-			sc.d  = altq->pq_u.hfsc_opts.rtsc_d;
+			sc.d = altq->pq_u.hfsc_opts.rtsc_d;
 			sc.m2 = altq->pq_u.hfsc_opts.rtsc_m2;
 			gsc_add_sc(&rtsc, &sc);
 		}
@@ -734,7 +734,7 @@ eval_pfqueue_hfsc(struct pfctl *pf, struct pf_altq *pa)
 		/* if the class has a link-sharing service curve, add it. */
 		if (opts->lssc_m2 != 0 && altq->pq_u.hfsc_opts.lssc_m2 != 0) {
 			sc.m1 = altq->pq_u.hfsc_opts.lssc_m1;
-			sc.d  = altq->pq_u.hfsc_opts.lssc_d;
+			sc.d = altq->pq_u.hfsc_opts.lssc_d;
 			sc.m2 = altq->pq_u.hfsc_opts.lssc_m2;
 			gsc_add_sc(&lssc, &sc);
 		}
@@ -743,7 +743,7 @@ eval_pfqueue_hfsc(struct pfctl *pf, struct pf_altq *pa)
 	/* check the real-time service curve.  reserve 20% of interface bw */
 	if (opts->rtsc_m2 != 0) {
 		sc.m1 = 0;
-		sc.d  = 0;
+		sc.d = 0;
 		sc.m2 = pa->ifbandwidth / 100 * 80;
 		if (!is_gsc_under_sc(&rtsc, &sc)) {
 			warnx("real-time sc exceeds the interface bandwidth");
@@ -754,7 +754,7 @@ eval_pfqueue_hfsc(struct pfctl *pf, struct pf_altq *pa)
 	/* check the link-sharing service curve. */
 	if (opts->lssc_m2 != 0) {
 		sc.m1 = parent->pq_u.hfsc_opts.lssc_m1;
-		sc.d  = parent->pq_u.hfsc_opts.lssc_d;
+		sc.d = parent->pq_u.hfsc_opts.lssc_d;
 		sc.m2 = parent->pq_u.hfsc_opts.lssc_m2;
 		if (!is_gsc_under_sc(&lssc, &sc)) {
 			warnx("link-sharing sc exceeds parent's sc");
@@ -1012,7 +1012,7 @@ gsc_add_seg(struct gen_sc *gsc, double x, double y, double d, double m)
 	else
 		x2 = x + d;
 	start = gsc_getentry(gsc, x);
-	end   = gsc_getentry(gsc, x2);
+	end = gsc_getentry(gsc, x2);
 	if (start == NULL || end == NULL)
 		return (-1);
 
diff --git a/sbin/pfctl/pfctl_osfp.c b/sbin/pfctl/pfctl_osfp.c
index 8321a3c58fd..5fb579bc9a2 100644
--- a/sbin/pfctl/pfctl_osfp.c
+++ b/sbin/pfctl/pfctl_osfp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_osfp.c,v 1.6 2004/02/10 17:53:37 henning Exp $ */
+/*	$OpenBSD: pfctl_osfp.c,v 1.7 2004/02/10 22:26:56 dhartmei Exp $ */
 
 /*
  * Copyright (c) 2003 Mike Frantzen <frantzen@openbsd.org>
@@ -830,7 +830,7 @@ get_int(char **line, size_t *len, int *var, int *mod,
 	}
 
 	for (; i < fieldlen; i++) {
-		if (field[i] < '0'  || field[i] > '9') {
+		if (field[i] < '0' || field[i] > '9') {
 			fprintf(stderr, "%s:%d non-digit character in %s\n",
 			    filename, lineno, name);
 			return (1);
diff --git a/sbin/pfctl/pfctl_parser.h b/sbin/pfctl/pfctl_parser.h
index 57b8fef8b19..125201f4f4c 100644
--- a/sbin/pfctl/pfctl_parser.h
+++ b/sbin/pfctl/pfctl_parser.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_parser.h,v 1.73 2004/01/29 01:25:13 mcbride Exp $ */
+/*	$OpenBSD: pfctl_parser.h,v 1.74 2004/02/10 22:26:56 dhartmei Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -173,9 +173,9 @@ int	eval_pfqueue(struct pfctl *, struct pf_altq *, struct node_queue_bw *,
 	    struct node_queue_opt *);
 
 void	 print_altq(const struct pf_altq *, unsigned, struct node_queue_bw *,
-	     struct node_queue_opt *);
+	    struct node_queue_opt *);
 void	 print_queue(const struct pf_altq *, unsigned, struct node_queue_bw *,
-	     int, struct node_queue_opt *);
+	    int, struct node_queue_opt *);
 
 int	pfctl_define_table(char *, int, int, const char *, const char *,
 	    struct pfr_buffer *, u_int32_t);
diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c
index c0af105a590..35abc5653be 100644
--- a/sbin/pfctl/pfctl_table.c
+++ b/sbin/pfctl/pfctl_table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_table.c,v 1.54 2004/02/10 18:29:30 henning Exp $ */
+/*	$OpenBSD: pfctl_table.c,v 1.55 2004/02/10 22:26:56 dhartmei Exp $ */
 
 /*
  * Copyright (c) 2002 Cedric Berger
@@ -122,12 +122,12 @@ int
 pfctl_table(int argc, char *argv[], char *tname, const char *command,
     char *file, const char *anchor, const char *ruleset, int opts)
 {
-	struct pfr_table  table;
-	struct pfr_buffer b, b2;
-	struct pfr_addr	 *a, *a2;
-	int		  nadd = 0, ndel = 0, nchange = 0, nzero = 0;
-	int		  rv = 0, flags = 0, nmatch = 0;
-	void		 *p;
+	struct pfr_table	 table;
+	struct pfr_buffer	 b, b2;
+	struct pfr_addr		*a, *a2;
+	int			 nadd = 0, ndel = 0, nchange = 0, nzero = 0;
+	int			 rv = 0, flags = 0, nmatch = 0;
+	void			*p;
 
 	if (command == NULL)
 		usage();