fix alot of whitespace problems...

6 files changed, 31 insertions, 26 deletions

diff --git a/usr.sbin/ospfd/kroute.c b/usr.sbin/ospfd/kroute.c
index b060e5b164c..f352a754929 100644
--- a/usr.sbin/ospfd/kroute.c
+++ b/usr.sbin/ospfd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.53 2007/09/25 11:25:41 claudio Exp $ */
+/*	$OpenBSD: kroute.c,v 1.54 2007/10/01 08:35:12 norby Exp $ */
 
 /*
  * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -88,7 +88,7 @@ int		protect_lo(void);
 u_int8_t	prefixlen_classful(in_addr_t);
 void		get_rtaddrs(int, struct sockaddr *, struct sockaddr **);
 void		if_change(u_short, int, struct if_data *);
-void		if_newaddr(u_short, struct sockaddr_in *, struct sockaddr_in *, 
+void		if_newaddr(u_short, struct sockaddr_in *, struct sockaddr_in *,
 		    struct sockaddr_in *);
 void		if_announce(void *);
 
@@ -679,7 +679,7 @@ kroute_remove(struct kroute_node *kr)
 			    inet_ntoa(kr->r.prefix), kr->r.prefixlen);
 			return (-1);
 		}
-	       	if (kr->next != NULL) {
+		if (kr->next != NULL) {
 			if (RB_INSERT(kroute_tree, &krt, kr->next) != NULL) {
 				log_warnx("kroute_remove failed to add %s/%u",
 				    inet_ntoa(kr->r.prefix), kr->r.prefixlen);
@@ -968,16 +968,17 @@ if_change(u_short ifindex, int flags, struct if_data *ifd)
 }
 
 void
-if_newaddr(u_short ifindex, struct sockaddr_in *ifa, struct sockaddr_in *mask, 
+if_newaddr(u_short ifindex, struct sockaddr_in *ifa, struct sockaddr_in *mask,
     struct sockaddr_in *brd)
-{   
+{
 	struct kif_node *kif;
 	struct kif_addr *ka;
-		     
+
 	if (ifa == NULL || ifa->sin_family != AF_INET)
 		return;
 	if ((kif = kif_find(ifindex)) == NULL) {
-		log_warnx("if_newaddr: corresponding if %i not found", ifindex);		return;
+		log_warnx("if_newaddr: corresponding if %i not found", ifindex);
+		return;
 	}
 	if ((ka = calloc(1, sizeof(struct kif_addr))) == NULL)
 		fatal("if_newaddr");
@@ -1506,7 +1507,7 @@ add:
 				    " not found");
 				return (-1);
 			}
-			/* 
+			/*
 			 * last route is getting removed request the
 			 * ospf route from the RDE to insert instead
 			 */
diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c
index cb8b9b5fff9..2f3ecbbd6d8 100644
--- a/usr.sbin/ospfd/ospfd.c
+++ b/usr.sbin/ospfd/ospfd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospfd.c,v 1.50 2007/09/25 11:25:41 claudio Exp $ */
+/*	$OpenBSD: ospfd.c,v 1.51 2007/10/01 08:35:12 norby Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -770,8 +770,9 @@ merge_interfaces(struct area *a, struct area *xa)
 	for (i = LIST_FIRST(&a->iface_list); i != NULL; i = ni) {
 		ni = LIST_NEXT(i, entry);
 		if (iface_lookup(xa, i) == NULL) {
-			log_debug("merge_config: proc %d area %s removing interface %s",
-			    ospfd_process, inet_ntoa(a->id), i->name);
+			log_debug("merge_config: proc %d area %s removing "
+			    "interface %s", ospfd_process, inet_ntoa(a->id),
+			    i->name);
 			if (ospfd_process == PROC_OSPF_ENGINE)
 				if_fsm(i, IF_EVT_DOWN);
 			LIST_REMOVE(i, entry);
@@ -783,8 +784,9 @@ merge_interfaces(struct area *a, struct area *xa)
 		ni = LIST_NEXT(xi, entry);
 		if ((i = iface_lookup(a, xi)) == NULL) {
 			/* new interface but delay initialisation */
-			log_debug("merge_config: proc %d area %s adding interface %s",
-			    ospfd_process, inet_ntoa(a->id), xi->name);
+			log_debug("merge_config: proc %d area %s adding "
+			    "interface %s", ospfd_process, inet_ntoa(a->id),
+			    xi->name);
 			LIST_REMOVE(xi, entry);
 			LIST_INSERT_HEAD(&a->iface_list, xi, entry);
 			xi->area = a;
diff --git a/usr.sbin/ospfd/ospfe.c b/usr.sbin/ospfd/ospfe.c
index ceaca7984bb..0dbaeaa5bf0 100644
--- a/usr.sbin/ospfd/ospfe.c
+++ b/usr.sbin/ospfd/ospfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospfe.c,v 1.57 2007/07/25 19:11:27 claudio Exp $ */
+/*	$OpenBSD: ospfe.c,v 1.58 2007/10/01 08:35:12 norby Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -1068,7 +1068,7 @@ ospfe_demote_area(struct area *area, int active)
 		return;
 
 	bzero(&dmsg, sizeof(dmsg));
-	strlcpy(dmsg.demote_group, area->demote_group,  
+	strlcpy(dmsg.demote_group, area->demote_group,
 	sizeof(dmsg.demote_group));
 	dmsg.level = area->demote_level;
 	if (active)
@@ -1087,7 +1087,7 @@ ospfe_demote_iface(struct iface *iface, int active)
 		return;
 
 	bzero(&dmsg, sizeof(dmsg));
-	strlcpy(dmsg.demote_group, iface->demote_group,  
+	strlcpy(dmsg.demote_group, iface->demote_group,
 	sizeof(dmsg.demote_group));
 	if (active)
 		dmsg.level = -1;
diff --git a/usr.sbin/ospfd/parse.y b/usr.sbin/ospfd/parse.y
index ada4676ef00..5ca5373bd30 100644
--- a/usr.sbin/ospfd/parse.y
+++ b/usr.sbin/ospfd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.51 2007/09/12 09:59:09 claudio Exp $ */
+/*	$OpenBSD: parse.y,v 1.52 2007/10/01 08:35:12 norby Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -852,9 +852,11 @@ top:
 			const char *errstr = NULL;
 
 			*p = '\0';
-			yylval.v.number = strtonum(buf, LLONG_MIN, LLONG_MAX, &errstr);
+			yylval.v.number = strtonum(buf, LLONG_MIN, LLONG_MAX,
+			    &errstr);
 			if (errstr) {
-				yyerror("\"%s\" invalid number: %s", buf, errstr);
+				yyerror("\"%s\" invalid number: %s", buf,
+				    errstr);
 				return (findeol());
 			}
 			return (NUMBER);
diff --git a/usr.sbin/ospfd/rde.c b/usr.sbin/ospfd/rde.c
index 35426f5b7b9..02e5cc06503 100644
--- a/usr.sbin/ospfd/rde.c
+++ b/usr.sbin/ospfd/rde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.c,v 1.70 2007/09/25 11:25:41 claudio Exp $ */
+/*	$OpenBSD: rde.c,v 1.71 2007/10/01 08:35:12 norby Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -718,7 +718,7 @@ void
 rde_send_change_kroute(struct rt_node *r)
 {
 	int			 krcount = 0;
-	struct kroute	 	 kr;
+	struct kroute		 kr;
 	struct rt_nexthop	*rn;
 	struct buf		*wbuf;
 
@@ -1046,7 +1046,7 @@ rde_asext_get(struct rroute *rr)
 struct lsa *
 rde_asext_put(struct rroute *rr)
 {
-	/* 
+	/*
 	 * just try to remove the LSA. If the prefix is announced as
 	 * stub net LSA lsa_find() will fail later and nothing will happen.
 	 */
@@ -1099,7 +1099,7 @@ rde_summary_update(struct rt_node *rte, struct area *area)
 	if (v == NULL)
 		v = lsa_find(area, type, rte->prefix.s_addr, rde_router_id());
 
-	/* suppressed/deleted routes are not found in the second lsa_find */ 
+	/* suppressed/deleted routes are not found in the second lsa_find */
 	if (v)
 		v->cost = rte->cost;
 }
diff --git a/usr.sbin/ospfd/rde_spf.c b/usr.sbin/ospfd/rde_spf.c
index f6b25f73fe5..890388ce40d 100644
--- a/usr.sbin/ospfd/rde_spf.c
+++ b/usr.sbin/ospfd/rde_spf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_spf.c,v 1.64 2007/09/16 15:00:11 claudio Exp $ */
+/*	$OpenBSD: rde_spf.c,v 1.65 2007/10/01 08:35:12 norby Exp $ */
 
 /*
  * Copyright (c) 2005 Esben Norby <norby@openbsd.org>
@@ -325,10 +325,10 @@ asext_calc(struct vertex *v)
 
 			if (rn->connected && r->d_type == DT_NET) {
 				if (v->lsa->data.asext.fw_addr != 0)
-					calc_nexthop_add(v, NULL, 
+					calc_nexthop_add(v, NULL,
 					    v->lsa->data.asext.fw_addr);
 				else
-					calc_nexthop_add(v, NULL, 
+					calc_nexthop_add(v, NULL,
 					    htonl(v->adv_rtr));
 			} else
 				calc_nexthop_add(v, NULL, rn->nexthop.s_addr);