spacing. note this, cedric

8 files changed, 23 insertions, 24 deletions

diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 9989f4ef7a5..3509e8eafd5 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.433 2003/12/31 11:18:24 cedric Exp $	*/
+/*	$OpenBSD: parse.y,v 1.434 2003/12/31 22:14:41 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -1571,7 +1571,7 @@ pfrule		: action dir logquick interface route af proto fromto
 				if ((r.rpool.opts & PF_POOL_TYPEMASK) ==
 				    PF_POOL_NONE && ($5.host->next != NULL ||
 				    $5.host->addr.type == PF_ADDR_TABLE ||
-				    DYNIF_MULTIADDR($5.host->addr))) 
+				    DYNIF_MULTIADDR($5.host->addr)))
 					r.rpool.opts |= PF_POOL_ROUNDROBIN;
 				if ((r.rpool.opts & PF_POOL_TYPEMASK) !=
 				    PF_POOL_ROUNDROBIN &&
@@ -2962,7 +2962,7 @@ natrule		: nataction interface af proto fromto tag redirpool pool_opts
 				    disallow_alias($7->host, "interface (%s) "
 				    "is only supported in round-robin "
 				    "redirection pools"))
-					YYERROR; 
+					YYERROR;
 				if ($7->host->next != NULL) {
 					if ((r.rpool.opts & PF_POOL_TYPEMASK) !=
 					    PF_POOL_ROUNDROBIN) {
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 6fcf60b6264..304a4396ae2 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl.c,v 1.197 2003/12/31 11:18:24 cedric Exp $ */
+/*	$OpenBSD: pfctl.c,v 1.198 2003/12/31 22:14:41 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1339,7 +1339,7 @@ pfctl_show_anchors(int dev, int opts, char *anchorname)
 				warn("DIOCGETANCHOR");
 				return (-1);
 			}
-			if (!(opts & PF_OPT_VERBOSE) && 
+			if (!(opts & PF_OPT_VERBOSE) &&
 			    !strcmp(pa.name, PF_RESERVED_ANCHOR))
 				continue;
 			printf("  %s\n", pa.name);
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index a894b646c70..a82705b3d64 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_parser.c,v 1.186 2003/12/31 11:18:24 cedric Exp $ */
+/*	$OpenBSD: pfctl_parser.c,v 1.187 2003/12/31 22:14:41 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1112,7 +1112,7 @@ ifa_load(void)
 			h->tail = n;
 		}
 	}
-		
+
 	iftab = h;
 	freeifaddrs(ifap);
 }
@@ -1144,8 +1144,8 @@ ifa_exists(const char *ifa_name, int group_ok)
 			    !strncmp(n->ifname, buf, IFNAMSIZ))
 				break;
 		if (n != NULL && n->ifa_flags &
-		    (PF_IFA_FLAG_DYNAMIC | PF_IFA_FLAG_CLONABLE)) 
-			return (n); 	/* XXX */
+		    (PF_IFA_FLAG_DYNAMIC | PF_IFA_FLAG_CLONABLE))
+			return (n);	/* XXX */
 	}
 	return (NULL);
 }
diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c
index 419989be5f8..d7ee37685af 100644
--- a/sbin/pfctl/pfctl_table.c
+++ b/sbin/pfctl/pfctl_table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_table.c,v 1.51 2003/12/31 11:18:24 cedric Exp $ */
+/*	$OpenBSD: pfctl_table.c,v 1.52 2003/12/31 22:14:41 deraadt Exp $ */
 
 /*
  * Copyright (c) 2002 Cedric Berger
@@ -557,14 +557,13 @@ pfctl_show_ifaces(int opts)
 	return (0);
 }
 
-void 
+void
 print_iface(struct pfi_if *p, int opts)
 {
 	time_t	tzero = p->pfif_tzero;
 	int	flags = (opts & PF_OPT_VERBOSE) ? p->pfif_flags : 0;
 	int	first = 1;
 	int	i, af, dir, act;
-	
 
 	printf("%s", p->pfif_name);
 	oprintf(flags, PFI_IFLAG_INSTANCE, "instance", &first, 0);
diff --git a/sys/net/pf.c b/sys/net/pf.c
index a74f21ecd73..0b7aefb390f 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.414 2003/12/31 11:18:25 cedric Exp $ */
+/*	$OpenBSD: pf.c,v 1.415 2003/12/31 22:14:42 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -241,7 +241,7 @@ struct pf_pool_limit pf_pool_limits[PF_LIMIT_MAX] =
 #define LOCKED_IF(r, k) (((r)->rule_flag & PFRULE_IFBOUND) ? (k) :    \
 	((r)->rule_flag & PFRULE_GRBOUND) ? (k)->pfik_parent :	       \
 	(k)->pfik_parent->pfik_parent)
-	
+
 static __inline int pf_src_compare(struct pf_src_node *, struct pf_src_node *);
 static __inline int pf_state_compare_lan_ext(struct pf_state *,
 	struct pf_state *);
@@ -2033,7 +2033,7 @@ pf_match_translation(struct pf_pdesc *pd, struct mbuf *m, int off,
 		}
 
 		r->evaluations++;
-		if (r->kif != NULL && 
+		if (r->kif != NULL &&
 		    (r->kif != kif && r->kif != kif->pfik_parent) == !r->ifnot)
 			r = r->skip[PF_SKIP_IFP].ptr;
 		else if (r->direction && r->direction != direction)
diff --git a/sys/net/pf_if.c b/sys/net/pf_if.c
index 0a1ff795a9d..5fff2f401e4 100644
--- a/sys/net/pf_if.c
+++ b/sys/net/pf_if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_if.c,v 1.3 2003/12/31 15:32:43 markus Exp $ */
+/*	$OpenBSD: pf_if.c,v 1.4 2003/12/31 22:14:42 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -136,7 +136,7 @@ pfi_attach_ifnet(struct ifnet *ifp)
 	s = splsoftnet();
 	pfi_update++;
 	if (ifp->if_index >= pfi_indexlim) {
-		/* 
+		/*
 		 * grow pfi_index2kif,  similar to ifindex2ifnet code in if.c
 		 */
 		size_t m, n, oldlim;
@@ -404,7 +404,7 @@ pfi_instance_add(struct ifnet *ifp, int net, int flags)
 	struct ifaddr	*ia;
 	int		 got4 = 0, got6 = 0;
 	int		 net2, af;
-	
+
 	if (ifp == NULL)
 		return;
 	TAILQ_FOREACH(ia, &ifp->if_addrlist, ifa_list) {
@@ -713,7 +713,7 @@ pfi_clr_istats(const char *name, int *nzero, int flags)
 	struct pfi_kif	*p;
 	int		 n = 0, s;
 	long		 tzero = time.tv_sec;
-	
+
 	s = splsoftnet();
 	ACCEPT_FLAGS(PFI_FLAG_GROUP|PFI_FLAG_INSTANCE);
 	RB_FOREACH(p, pfi_ifhead, &pfi_ifs) {
@@ -759,7 +759,7 @@ struct pfi_kif *
 pfi_lookup_if(const char *name)
 {
 	struct pfi_kif	*p, key;
-	
+
 	strlcpy(key.pfik_name, name, sizeof(key.pfik_name));
 	p = RB_FIND(pfi_ifhead, &pfi_ifs, &key);
 	return (p);
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 71e048c4233..15ff41b7d42 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_ioctl.c,v 1.97 2003/12/31 11:18:25 cedric Exp $ */
+/*	$OpenBSD: pf_ioctl.c,v 1.98 2003/12/31 22:14:42 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1300,7 +1300,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 		state->creation = time.tv_sec;
 		state->packets[0] = state->packets[1] = 0;
 		state->bytes[0] = state->bytes[1] = 0;
-		
+
 		if (pf_insert_state(kif, state)) {
 			pfi_maybe_destroy(kif);
 			pool_put(&pf_state_pl, state);
diff --git a/sys/net/pf_table.c b/sys/net/pf_table.c
index 8862b22b647..1b0d3d68f8e 100644
--- a/sys/net/pf_table.c
+++ b/sys/net/pf_table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_table.c,v 1.43 2003/12/31 11:18:25 cedric Exp $	*/
+/*	$OpenBSD: pf_table.c,v 1.44 2003/12/31 22:14:42 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2002 Cedric Berger
@@ -58,7 +58,7 @@
 	((flags & PFR_FLAG_USERIOCTL) ?		\
 	copyout((from), (to), (size)) :		\
 	(bcopy((from), (to), (size)), 0))
-	
+
 #define	FILLIN_SIN(sin, addr)			\
 	do {					\
 		(sin).sin_len = sizeof(sin);	\