KNF

4 files changed, 34 insertions, 34 deletions

diff --git a/sys/net/pf.c b/sys/net/pf.c
index 2ff09f04c04..17ee4ffcabd 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.423 2004/02/10 20:20:01 itojun Exp $ */
+/*	$OpenBSD: pf.c,v 1.424 2004/02/10 22:42:57 dhartmei Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -558,7 +558,7 @@ int
 pf_insert_src_node(struct pf_src_node **sn, struct pf_rule *rule,
     struct pf_addr *src, sa_family_t af)
 {
-	struct pf_src_node  k;
+	struct pf_src_node	k;
 
 	if (*sn == NULL) {
 		k.af = af;
@@ -1769,7 +1769,7 @@ pf_map_addr(sa_family_t af, struct pf_rule *r, struct pf_addr *saddr,
 	struct pf_pool		*rpool = &r->rpool;
 	struct pf_addr		*raddr = &rpool->cur->addr.v.a.addr;
 	struct pf_addr		*rmask = &rpool->cur->addr.v.a.mask;
-	struct pf_pooladdr      *acur = rpool->cur;
+	struct pf_pooladdr	*acur = rpool->cur;
 	struct pf_src_node	 k;
 
 	if (*sn == NULL && r->rpool.opts & PF_POOL_STICKYADDR &&
@@ -5264,15 +5264,15 @@ pf_add_mbuf_tag(struct mbuf *m, u_int tag)
 int
 pf_test(int dir, struct ifnet *ifp, struct mbuf **m0)
 {
-	struct pfi_kif	  *kif;
-	u_short		   action, reason = 0, log = 0;
-	struct mbuf	  *m = *m0;
-	struct ip	  *h;
-	struct pf_rule	  *a = NULL, *r = &pf_default_rule, *tr, *nr;
-	struct pf_state	  *s = NULL;
-	struct pf_ruleset *ruleset = NULL;
-	struct pf_pdesc	   pd;
-	int		   off, dirndx, pqid = 0;
+	struct pfi_kif		*kif;
+	u_short			 action, reason = 0, log = 0;
+	struct mbuf		*m = *m0;
+	struct ip		*h;
+	struct pf_rule		*a = NULL, *r = &pf_default_rule, *tr, *nr;
+	struct pf_state		*s = NULL;
+	struct pf_ruleset	*ruleset = NULL;
+	struct pf_pdesc		 pd;
+	int			 off, dirndx, pqid = 0;
 
 	if (!pf_status.running ||
 	    (m_tag_find(m, PACKET_TAG_PF_GENERATED, NULL) != NULL))
@@ -5569,15 +5569,15 @@ done:
 int
 pf_test6(int dir, struct ifnet *ifp, struct mbuf **m0)
 {
-	struct pfi_kif	  *kif;
-	u_short		   action, reason = 0, log = 0;
-	struct mbuf	  *m = *m0;
-	struct ip6_hdr	  *h;
-	struct pf_rule	  *a = NULL, *r = &pf_default_rule, *tr, *nr;
-	struct pf_state	  *s = NULL;
-	struct pf_ruleset *ruleset = NULL;
-	struct pf_pdesc    pd;
-	int		   off, terminal = 0, dirndx;
+	struct pfi_kif		*kif;
+	u_short			 action, reason = 0, log = 0;
+	struct mbuf		*m = *m0;
+	struct ip6_hdr		*h;
+	struct pf_rule		*a = NULL, *r = &pf_default_rule, *tr, *nr;
+	struct pf_state		*s = NULL;
+	struct pf_ruleset	*ruleset = NULL;
+	struct pf_pdesc		 pd;
+	int			 off, terminal = 0, dirndx;
 
 	if (!pf_status.running ||
 	    (m_tag_find(m, PACKET_TAG_PF_GENERATED, NULL) != NULL))
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index fb23c1b6074..6482a1224c9 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_ioctl.c,v 1.103 2004/02/10 18:49:10 henning Exp $ */
+/*	$OpenBSD: pf_ioctl.c,v 1.104 2004/02/10 22:42:57 dhartmei Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -667,7 +667,7 @@ pf_commit_rules(u_int32_t ticket, int rs_num, char *anchor, char *ruleset)
 {
 	struct pf_ruleset	*rs;
 	struct pf_rule		*rule;
-	struct pf_rulequeue     *old_rules;
+	struct pf_rulequeue	*old_rules;
 	int			 s;
 
 	if (rs_num < 0 || rs_num >= PF_RULESET_MAX)
diff --git a/sys/net/pf_table.c b/sys/net/pf_table.c
index 46bee0b41b0..5b9d781b452 100644
--- a/sys/net/pf_table.c
+++ b/sys/net/pf_table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_table.c,v 1.45 2004/02/10 18:49:10 henning Exp $	*/
+/*	$OpenBSD: pf_table.c,v 1.46 2004/02/10 22:42:57 dhartmei Exp $	*/
 
 /*
  * Copyright (c) 2002 Cedric Berger
@@ -127,7 +127,7 @@ struct pool		 pfr_ktable_pl;
 struct pool		 pfr_kentry_pl;
 struct sockaddr_in	 pfr_sin;
 struct sockaddr_in6	 pfr_sin6;
-union  sockaddr_union	 pfr_mask;
+union sockaddr_union	 pfr_mask;
 struct pf_addr		 pfr_ffaddr;
 
 void			 pfr_copyout_addr(struct pfr_addr *,
@@ -174,7 +174,7 @@ void			 pfr_clean_node_mask(struct pfr_ktable *,
 int			 pfr_table_count(struct pfr_table *, int);
 int			 pfr_skip_table(struct pfr_table *,
 			    struct pfr_ktable *, int);
-struct pfr_kentry       *pfr_kentry_byidx(struct pfr_ktable *, int, int);
+struct pfr_kentry	*pfr_kentry_byidx(struct pfr_ktable *, int, int);
 
 RB_PROTOTYPE(pfr_ktablehead, pfr_ktable, pfrkt_tree, pfr_ktable_compare);
 RB_GENERATE(pfr_ktablehead, pfr_ktable, pfrkt_tree, pfr_ktable_compare);
@@ -833,7 +833,7 @@ void
 pfr_clean_node_mask(struct pfr_ktable *kt,
     struct pfr_kentryworkq *workq)
 {
-	struct pfr_kentry       *p;
+	struct pfr_kentry	*p;
 
 	SLIST_FOREACH(p, workq, pfrke_workq)
 		pfr_unroute_kentry(kt, p);
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index fc5a90fe206..3788a43dac0 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfvar.h,v 1.182 2004/02/10 18:49:10 henning Exp $ */
+/*	$OpenBSD: pfvar.h,v 1.183 2004/02/10 22:42:57 dhartmei Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -558,7 +558,7 @@ struct pf_src_node {
 	struct pfi_kif	*kif;
 	u_int32_t	 bytes;
 	u_int32_t	 packets;
-	u_int32_t        states;
+	u_int32_t	 states;
 	u_int32_t	 creation;
 	u_int32_t	 expire;
 	sa_family_t	 af;
@@ -619,7 +619,7 @@ struct pf_state {
 	u_int32_t	 expire;
 	u_int32_t	 packets[2];
 	u_int32_t	 bytes[2];
-	u_int32_t        creatorid;
+	u_int32_t	 creatorid;
 	sa_family_t	 af;
 	u_int8_t	 proto;
 	u_int8_t	 direction;
@@ -759,8 +759,8 @@ struct pfr_ktable {
 };
 #define pfrkt_t		pfrkt_ts.pfrts_t
 #define pfrkt_name	pfrkt_t.pfrt_name
-#define pfrkt_anchor    pfrkt_t.pfrt_anchor
-#define pfrkt_ruleset   pfrkt_t.pfrt_ruleset
+#define pfrkt_anchor	pfrkt_t.pfrt_anchor
+#define pfrkt_ruleset	pfrkt_t.pfrt_ruleset
 #define pfrkt_flags	pfrkt_t.pfrt_flags
 #define pfrkt_cnt	pfrkt_ts.pfrts_cnt
 #define pfrkt_refcnt	pfrkt_ts.pfrts_refcnt
@@ -835,8 +835,8 @@ struct pf_pdesc {
 #endif /* INET6 */
 		void			*any;
 	} hdr;
-	struct pf_addr   baddr;         /* address before translation */
-	struct pf_addr   naddr;         /* address after translation */
+	struct pf_addr	 baddr;		/* address before translation */
+	struct pf_addr	 naddr;		/* address after translation */
 	struct pf_rule	*nat_rule;	/* nat/rdr rule applied to packet */
 	struct pf_addr	*src;
 	struct pf_addr	*dst;