Spaces and other minor cleanup.

5 files changed, 15 insertions, 17 deletions

diff --git a/usr.sbin/ospfd/auth.c b/usr.sbin/ospfd/auth.c
index f9373249860..8a1c1d88d34 100644
--- a/usr.sbin/ospfd/auth.c
+++ b/usr.sbin/ospfd/auth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth.c,v 1.8 2006/02/02 15:11:54 norby Exp $ */
+/*	$OpenBSD: auth.c,v 1.9 2006/03/08 15:35:07 claudio Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -59,8 +59,8 @@ auth_validate(void *buf, u_int16_t len, struct iface *iface, struct nbr *nbr)
 		     sizeof(ospf_hdr->auth_key.simple));
 
 		if (in_cksum(ospf_hdr, ntohs(ospf_hdr->len))) {
-			log_debug("auth_validate: invalid checksum, interface %s",
-			    iface->name);
+			log_debug("auth_validate: invalid checksum, "
+			    "interface %s", iface->name);
 			return (-1);
 		}
 		break;
@@ -150,8 +150,7 @@ auth_gen(struct buf *buf, struct iface *iface)
 		fatalx("auth_gen: resulting ospf packet too big");
 	ospf_hdr->len = htons((u_int16_t)buf->wpos);
 	/* clear auth_key field */
-	bzero(ospf_hdr->auth_key.simple,
-	    sizeof(ospf_hdr->auth_key.simple));
+	bzero(ospf_hdr->auth_key.simple, sizeof(ospf_hdr->auth_key.simple));
 
 	switch (iface->auth_type) {
 	case AUTH_NONE:
@@ -171,8 +170,7 @@ auth_gen(struct buf *buf, struct iface *iface)
 		iface->crypt_seq_num++;
 
 		/* insert plaintext key */
-		if ((md = md_list_find(iface, iface->auth_keyid))
-		    == NULL) {
+		if ((md = md_list_find(iface, iface->auth_keyid)) == NULL) {
 			log_debug("auth_validate: keyid %d not configured, "
 			    "interface %s", iface->auth_keyid, iface->name);
 			return (-1);
diff --git a/usr.sbin/ospfd/interface.c b/usr.sbin/ospfd/interface.c
index 76dc9da9cc8..605e60963c4 100644
--- a/usr.sbin/ospfd/interface.c
+++ b/usr.sbin/ospfd/interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interface.c,v 1.41 2006/01/05 15:53:36 claudio Exp $ */
+/*	$OpenBSD: interface.c,v 1.42 2006/03/08 15:35:07 claudio Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -107,7 +107,7 @@ if_fsm(struct iface *iface, enum iface_event event)
 		}
 
 	if (iface_fsm[i].state == -1) {
-		/* XXX event outside of the defined fsm, ignore it. */
+		/* event outside of the defined fsm, ignore it. */
 		log_debug("if_fsm: interface %s, "
 		    "event %s not expected in state %s", iface->name,
 		    if_event_name(event), if_state_name(old_state));
@@ -763,7 +763,7 @@ if_set_recvbuf(int fd)
 	bsize = 65535;
 	while (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &bsize,
 	    sizeof(bsize)) == -1)
-		bsize /= 2; 
+		bsize /= 2;
 }
 
 int
diff --git a/usr.sbin/ospfd/lsupdate.c b/usr.sbin/ospfd/lsupdate.c
index 8120c2b355c..ce54f431aa6 100644
--- a/usr.sbin/ospfd/lsupdate.c
+++ b/usr.sbin/ospfd/lsupdate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lsupdate.c,v 1.27 2006/02/23 16:06:29 claudio Exp $ */
+/*	$OpenBSD: lsupdate.c,v 1.28 2006/03/08 15:35:07 claudio Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -443,7 +443,7 @@ ls_retrans_timer(int fd, short event, void *bula)
 
 	clock_gettime(CLOCK_MONOTONIC, &tp);
 	now = tp.tv_sec;
-	
+
 	if (nbr->iface->self == nbr) {
 		/*
 		 * oneshot needs to be set for lsa queued for flooding,
diff --git a/usr.sbin/ospfd/parse.y b/usr.sbin/ospfd/parse.y
index 819f5ebb5d0..b8b34c15c9f 100644
--- a/usr.sbin/ospfd/parse.y
+++ b/usr.sbin/ospfd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.24 2006/01/20 00:01:20 millert Exp $ */
+/*	$OpenBSD: parse.y,v 1.25 2006/03/08 15:35:07 claudio Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -824,7 +824,7 @@ parse_config(char *filename, int opts)
 
 	if (conf->rtr_id.s_addr == 0)
 		conf->rtr_id.s_addr = get_rtr_id();
-	
+
 	return (conf);
 }
 
@@ -1001,7 +1001,7 @@ get_rtr_id(void)
 			ip = cur;
 	}
 	freeifaddrs(ifap);
-	
+
 	if (ip == 0)
 		fatal("router-id is 0.0.0.0");
 
diff --git a/usr.sbin/ospfd/rde_lsdb.c b/usr.sbin/ospfd/rde_lsdb.c
index 0f98c601a47..795d126699a 100644
--- a/usr.sbin/ospfd/rde_lsdb.c
+++ b/usr.sbin/ospfd/rde_lsdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_lsdb.c,v 1.27 2006/02/23 16:16:27 norby Exp $ */
+/*	$OpenBSD: rde_lsdb.c,v 1.28 2006/03/08 15:35:07 claudio Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -664,7 +664,7 @@ lsa_equal(struct lsa *a, struct lsa *b)
 	if (a == NULL || b == NULL)
 		return (0);
 	if (a->hdr.len != b->hdr.len)
-	       return (0);
+		return (0);
 	if (a->hdr.opts != b->hdr.opts)
 		return (0);
 	/* LSA with age MAX_AGE are never equal */