remove trailing spaces and tabs from source code; no binary changes

(verified by both sthen@ and me).

ok sthen@; "just commit it" claudio@

17 files changed, 48 insertions, 48 deletions

diff --git a/sbin/route/route.c b/sbin/route/route.c
index 3546c1d8c61..69688dd93e9 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.147 2010/07/14 01:23:04 dlg Exp $	*/
+/*	$OpenBSD: route.c,v 1.148 2010/09/02 14:03:21 sobrado Exp $	*/
 /*	$NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $	*/
 
 /*
@@ -429,7 +429,7 @@ newroute(int argc, char **argv)
 				if (!--argc)
 					usage(1+*argv);
 				if (af != AF_INET && af != AF_INET6)
-					errx(1, "-mplslabel requires " 
+					errx(1, "-mplslabel requires "
 					    "-inet or -inet6");
 				getmplslabel(*++argv, 0);
 				mpls_flags = MPLS_OP_PUSH;
@@ -1405,7 +1405,7 @@ print_getmsg(struct rt_msghdr *rtm, int msglen)
 		    routename(mpls));
 	}
 	printf("   priority: %u (%s)\n", rtm->rtm_priority,
-	   priorityname(rtm->rtm_priority)); 
+	   priorityname(rtm->rtm_priority));
 	printf("      flags: ");
 	bprintf(stdout, rtm->rtm_flags, routeflags);
 	printf("\n");
diff --git a/usr.sbin/bgpctl/bgpctl.c b/usr.sbin/bgpctl/bgpctl.c
index ddf0c69d524..cd34c92bb38 100644
--- a/usr.sbin/bgpctl/bgpctl.c
+++ b/usr.sbin/bgpctl/bgpctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bgpctl.c,v 1.160 2010/05/26 13:56:07 nicm Exp $ */
+/*	$OpenBSD: bgpctl.c,v 1.161 2010/09/02 14:03:21 sobrado Exp $ */
 
 /*
  * Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -924,7 +924,7 @@ show_nexthop_msg(struct imsg *imsg)
 			} else if (asprintf(&s1, ", %s", get_linkstate(
 			    p->kif.media_type, p->kif.link_state)) == -1)
 					err(1, NULL);
-			if (asprintf(&s, "%s (%s%s)", p->kif.ifname, 
+			if (asprintf(&s, "%s (%s%s)", p->kif.ifname,
 			    p->kif.flags & IFF_UP ? "UP" : "DOWN", s1) == -1)
 				err(1, NULL);
 			printf("%-15s", s);
@@ -1236,7 +1236,7 @@ show_rib_detail_msg(struct imsg *imsg, int nodescr)
 		case ATTR_AGGREGATOR:
 			memcpy(&as, data, sizeof(as));
 			memcpy(&id, data + sizeof(as), sizeof(id));
-			printf("    Aggregator: %s [%s]\n", 
+			printf("    Aggregator: %s [%s]\n",
 			    log_as(ntohl(as)), inet_ntoa(id));
 			break;
 		case ATTR_ORIGINATOR_ID:
@@ -1416,11 +1416,11 @@ show_ext_community(u_char *data, u_int16_t len)
 		case EXT_COMMUNITY_OPAQUE:
 			memcpy(&ext, data + i, sizeof(ext));
 			ext = betoh64(ext) & 0xffffffffffffLL;
-			printf("%s 0x%llx", log_ext_subtype(subtype), ext); 
+			printf("%s 0x%llx", log_ext_subtype(subtype), ext);
 			break;
 		default:
 			memcpy(&ext, data + i, sizeof(ext));
-			printf("0x%llx", betoh64(ext)); 
+			printf("0x%llx", betoh64(ext));
 		}
 		if (i + 8 < len)
 			printf(", ");
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c
index 6c0d2bc946f..15d6953e72b 100644
--- a/usr.sbin/bgpd/bgpd.c
+++ b/usr.sbin/bgpd/bgpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bgpd.c,v 1.165 2010/06/28 19:52:03 sobrado Exp $ */
+/*	$OpenBSD: bgpd.c,v 1.166 2010/09/02 14:03:21 sobrado Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -505,7 +505,7 @@ reconfigure(char *conffile, struct bgpd_config *conf, struct mrt_head *mrt_l,
 		if (imsg_compose(ibuf_rde, IMSG_RECONF_RDOMAIN, 0, 0, -1,
 		    rd, sizeof(*rd)) == -1)
 			return (-1);
-		
+
 		/* export targets */
 		if (imsg_compose(ibuf_rde, IMSG_RECONF_RDOMAIN_EXPORT, 0, 0,
 		    -1, NULL, 0) == -1)
diff --git a/usr.sbin/bgpd/config.c b/usr.sbin/bgpd/config.c
index 8ad8e817627..bd46f9e3a47 100644
--- a/usr.sbin/bgpd/config.c
+++ b/usr.sbin/bgpd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.54 2010/06/27 19:53:34 claudio Exp $ */
+/*	$OpenBSD: config.c,v 1.55 2010/09/02 14:03:21 sobrado Exp $ */
 
 /*
  * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -78,7 +78,7 @@ merge_config(struct bgpd_config *xconf, struct bgpd_config *conf,
 			nla->reconf = RECONF_REINIT;
 
 	} else {
-		/* 
+		/*
 		 * merge new listeners:
 		 * -flag all existing ones as to be deleted
 		 * -those that are in both new and old: flag to keep
diff --git a/usr.sbin/bgpd/kroute.c b/usr.sbin/bgpd/kroute.c
index 10c5bd68606..2ab93d78655 100644
--- a/usr.sbin/bgpd/kroute.c
+++ b/usr.sbin/bgpd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.183 2010/07/12 14:35:13 bluhm Exp $ */
+/*	$OpenBSD: kroute.c,v 1.184 2010/09/02 14:03:21 sobrado Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -1152,7 +1152,7 @@ kr_net_reload(u_int rtableid, struct network_head *nh)
 		} else
 			TAILQ_INSERT_TAIL(&kt->krn, n, entry);
 	}
-	
+
 	for (n = TAILQ_FIRST(&kt->krn); n != NULL; n = xn) {
 		xn = TAILQ_NEXT(n, entry);
 		if (n->net.old) {
@@ -1637,7 +1637,7 @@ kroute6_find(struct ktable *kt, const struct in6_addr *prefix,
 		while (tmp) {
 			if (kroute6_compare(&s, tmp) == 0)
 				kn6 = tmp;
-			else 
+			else
 				break;
 			tmp = RB_PREV(kroute6_tree, &kt->krt6, kn6);
 		}
diff --git a/usr.sbin/bgpd/mrt.c b/usr.sbin/bgpd/mrt.c
index 1fff1134f6b..d2bfe6475d8 100644
--- a/usr.sbin/bgpd/mrt.c
+++ b/usr.sbin/bgpd/mrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mrt.c,v 1.69 2010/06/04 10:13:00 claudio Exp $ */
+/*	$OpenBSD: mrt.c,v 1.70 2010/09/02 14:03:21 sobrado Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
@@ -584,7 +584,7 @@ mrt_dump_hdr_rde(struct ibuf **bp, u_int16_t type, u_int16_t subtype,
 	default:
 		log_warnx("mrt_dump_hdr_rde: unsupported type");
 		goto fail;
-	}	
+	}
 	return (0);
 
 fail:
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index 04ed72eb245..eecd9a7a134 100644
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.257 2010/08/03 18:42:40 henning Exp $ */
+/*	$OpenBSD: parse.y,v 1.258 2010/09/02 14:03:21 sobrado Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -2388,7 +2388,7 @@ top:
 		if (next == '=')
 			return (NE);
 		lungetc(next);
-		break;		
+		break;
 	case '<':
 		next = lgetc(0);
 		if (next == '=')
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c
index 172a5168a4d..f47c44eeb1c 100644
--- a/usr.sbin/bgpd/rde.c
+++ b/usr.sbin/bgpd/rde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.c,v 1.297 2010/07/14 09:00:08 claudio Exp $ */
+/*	$OpenBSD: rde.c,v 1.298 2010/09/02 14:03:21 sobrado Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -1703,7 +1703,7 @@ rde_get_mp_nexthop(u_char *data, u_int16_t len, u_int8_t aid,
 		/*
 		 * Neither RFC4364 nor RFC3107 specify the format of the
 		 * nexthop in an explicit way. The quality of RFC went down
-		 * the toilet the larger the the number got. 
+		 * the toilet the larger the the number got.
 		 * RFC4364 is very confusing about VPN-IPv4 address and the
 		 * VPN-IPv4 prefix that carries also a MPLS label.
 		 * So the nexthop is a 12-byte address with a 64bit RD and
@@ -2150,11 +2150,11 @@ rde_dump_filter(struct prefix *p, struct ctl_show_rib_request *req)
 {
 	struct rde_peer		*peer;
 
-	if (req->flags & F_CTL_ADJ_IN || 
+	if (req->flags & F_CTL_ADJ_IN ||
 	    !(req->flags & (F_CTL_ADJ_IN|F_CTL_ADJ_OUT))) {
 		if (req->peerid && req->peerid != p->aspath->peer->conf.id)
 			return;
-		if (req->type == IMSG_CTL_SHOW_RIB_AS && 
+		if (req->type == IMSG_CTL_SHOW_RIB_AS &&
 		    !aspath_match(p->aspath->aspath, req->as.type, req->as.as))
 			return;
 		if (req->type == IMSG_CTL_SHOW_RIB_COMMUNITY &&
@@ -2713,7 +2713,7 @@ rde_generate_updates(u_int16_t ribid, struct prefix *new, struct prefix *old)
 
 	/*
 	 * If old is != NULL we know it was active and should be removed.
-	 * If new is != NULL we know it is reachable and then we should 
+	 * If new is != NULL we know it is reachable and then we should
 	 * generate an update.
 	 */
 	if (old == NULL && new == NULL)
@@ -2846,7 +2846,7 @@ rde_update6_queue_runner(u_int8_t aid)
 				b = queue_buf + r;
 				break;
 			}
-				
+
 			/* finally send message to SE */
 			if (imsg_compose(ibuf_se, IMSG_UPDATE, peer->conf.id,
 			    0, -1, b, len) == -1)
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c
index a2bbd6dd848..55b232fc8f3 100644
--- a/usr.sbin/bgpd/session.c
+++ b/usr.sbin/bgpd/session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: session.c,v 1.310 2010/06/27 19:53:34 claudio Exp $ */
+/*	$OpenBSD: session.c,v 1.311 2010/09/02 14:03:21 sobrado Exp $ */
 
 /*
  * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -174,7 +174,7 @@ setup_listeners(u_int *la_cnt)
 }
 
 pid_t
-session_main(int pipe_m2s[2], int pipe_s2r[2], int pipe_m2r[2], 
+session_main(int pipe_m2s[2], int pipe_s2r[2], int pipe_m2r[2],
     int pipe_s2rctl[2])
 {
 	int			 nfds, timeout;
@@ -369,7 +369,7 @@ session_main(int pipe_m2s[2], int pipe_s2r[2], int pipe_m2r[2],
 		if (ctl_queued < SESSION_CTL_QUEUE_MAX)
 			/*
 			 * Do not act as unlimited buffer. Don't read in more
-			 * messages if the ctl sockets are getting full. 
+			 * messages if the ctl sockets are getting full.
 			 */
 			pfd[PFD_PIPE_ROUTE_CTL].events = POLLIN;
 		pfd[PFD_SOCK_CTL].fd = csock;
diff --git a/usr.sbin/dvmrpd/control.c b/usr.sbin/dvmrpd/control.c
index fcb73eded14..b655306426b 100644
--- a/usr.sbin/dvmrpd/control.c
+++ b/usr.sbin/dvmrpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.13 2010/05/14 11:52:19 claudio Exp $ */
+/*	$OpenBSD: control.c,v 1.14 2010/09/02 14:03:21 sobrado Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -267,7 +267,7 @@ control_dispatch_imsg(int fd, short event, void *bula)
 
 			memcpy(&verbose, imsg.data, sizeof(verbose));
 			log_verbose(verbose);
-			break;		
+			break;
 		default:
 			log_debug("control_dispatch_imsg: "
 			    "error handling imsg %d", imsg.hdr.type);
diff --git a/usr.sbin/dvmrpd/rde_srt.c b/usr.sbin/dvmrpd/rde_srt.c
index 9b8de2a99f6..d646c2452f7 100644
--- a/usr.sbin/dvmrpd/rde_srt.c
+++ b/usr.sbin/dvmrpd/rde_srt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_srt.c,v 1.24 2009/09/06 09:52:14 michele Exp $ */
+/*	$OpenBSD: rde_srt.c,v 1.25 2010/09/02 14:03:21 sobrado Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -376,7 +376,7 @@ srt_check_route(struct route_report *rr, int connected)
 
 	if (rr->metric < INFINITY_METRIC) {
 		/* If it is our current nexthop it cannot be a
-		 * downstream router */ 
+		 * downstream router */
 		if (nbr_ip != nbr_report)
 			if ((ds_nbr = srt_find_ds(rn, nbr_report)))
 				srt_delete_ds(rn, ds_nbr, iface);
diff --git a/usr.sbin/ospfd/auth.c b/usr.sbin/ospfd/auth.c
index 0410a088da4..63d6bb0b705 100644
--- a/usr.sbin/ospfd/auth.c
+++ b/usr.sbin/ospfd/auth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth.c,v 1.18 2010/05/26 13:56:08 nicm Exp $ */
+/*	$OpenBSD: auth.c,v 1.19 2010/09/02 14:03:21 sobrado Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -264,7 +264,7 @@ md_list_send(struct auth_md_head *head, struct imsgev *to)
 	struct auth_md	*m;
 
 	TAILQ_FOREACH(m, head, entry)
-		if (imsg_compose_event(to, IMSG_RECONF_AUTHMD, 0, 0, -1, m, 
+		if (imsg_compose_event(to, IMSG_RECONF_AUTHMD, 0, 0, -1, m,
 		    sizeof(*m)) == -1)
 			return (-1);
 
diff --git a/usr.sbin/ospfd/control.c b/usr.sbin/ospfd/control.c
index 2c1d0cd5b20..0012c9ebd40 100644
--- a/usr.sbin/ospfd/control.c
+++ b/usr.sbin/ospfd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.33 2010/05/14 11:52:19 claudio Exp $ */
+/*	$OpenBSD: control.c,v 1.34 2010/09/02 14:03:22 sobrado Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -275,7 +275,7 @@ control_dispatch_imsg(int fd, short event, void *bula)
 
 			memcpy(&verbose, imsg.data, sizeof(verbose));
 			log_verbose(verbose);
-			break;		
+			break;
 		default:
 			log_debug("control_dispatch_imsg: "
 			    "error handling imsg %d", imsg.hdr.type);
diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c
index 679022223d7..aabe7611e4f 100644
--- a/usr.sbin/ospfd/ospfd.c
+++ b/usr.sbin/ospfd/ospfd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospfd.c,v 1.74 2010/05/14 08:30:18 sthen Exp $ */
+/*	$OpenBSD: ospfd.c,v 1.75 2010/09/02 14:03:22 sobrado Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -743,7 +743,7 @@ merge_config(struct ospfd_conf *conf, struct ospfd_conf *xconf)
 				SIMPLEQ_REMOVE_HEAD(&a->redist_list, entry);
 				free(r);
 			}
-			
+
 			while ((r = SIMPLEQ_FIRST(&xa->redist_list)) != NULL) {
 				SIMPLEQ_REMOVE_HEAD(&xa->redist_list, entry);
 				SIMPLEQ_INSERT_TAIL(&a->redist_list, r, entry);
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y
index 023bea5a37e..88673e04fd3 100644
--- a/usr.sbin/relayd/parse.y
+++ b/usr.sbin/relayd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.146 2010/08/07 17:59:02 claudio Exp $	*/
+/*	$OpenBSD: parse.y,v 1.147 2010/09/02 14:03:22 sobrado Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org>
@@ -610,7 +610,7 @@ tableopts_l	: tableopts tableopts_l
 		| tableopts
 		;
 
-tableopts	: CHECK tablecheck 
+tableopts	: CHECK tablecheck
 		| port			{
 			if ($1.op != PF_OP_EQ) {
 				yyerror("invalid port");
@@ -1039,7 +1039,7 @@ protonode	: nodetype APPEND STRING TO STRING nodeopts		{
 				fatal("out of memory");
 			free($3);
 			proto->lateconnect++;
-		}		
+		}
 		| nodetype FILTER					{
 			node.action = NODE_ACTION_FILTER;
 			node.key = NULL;
diff --git a/usr.sbin/relayd/pfe_filter.c b/usr.sbin/relayd/pfe_filter.c
index 56bc94cb6e9..f30f5c993b0 100644
--- a/usr.sbin/relayd/pfe_filter.c
+++ b/usr.sbin/relayd/pfe_filter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe_filter.c,v 1.43 2010/03/24 16:29:37 pyr Exp $	*/
+/*	$OpenBSD: pfe_filter.c,v 1.44 2010/09/02 14:03:22 sobrado Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -264,9 +264,9 @@ kill_srcnodes(struct relayd *env, struct table *table)
 
 		switch (host->conf.ss.ss_family) {
 		case AF_INET:
-		sain = (struct sockaddr_in *)&host->conf.ss;   
+		sain = (struct sockaddr_in *)&host->conf.ss;
 			bcopy(&sain->sin_addr,
-			    &psnk.psnk_dst.addr.v.a.addr.v4, 
+			    &psnk.psnk_dst.addr.v.a.addr.v4,
 			    sizeof(psnk.psnk_dst.addr.v.a.addr.v4));
 			break;
 		case AF_INET6:
@@ -274,12 +274,12 @@ kill_srcnodes(struct relayd *env, struct table *table)
 			bcopy(&sain6->sin6_addr,
 			    &psnk.psnk_dst.addr.v.a.addr.v6,
 			    sizeof(psnk.psnk_dst.addr.v.a.addr.v6));
-			break;   
+			break;
 		default:
 			fatalx("kill_srcnodes: unknown address family");
 			break;
 		}
-			
+
 		psnk.psnk_af = host->conf.ss.ss_family;
 		psnk.psnk_killed = 0;
 
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c
index d3e3431b976..2e148297bcd 100644
--- a/usr.sbin/relayd/relayd.c
+++ b/usr.sbin/relayd/relayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.c,v 1.97 2010/05/14 11:13:36 reyk Exp $	*/
+/*	$OpenBSD: relayd.c,v 1.98 2010/09/02 14:03:22 sobrado Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org>
@@ -1091,7 +1091,7 @@ canonicalize_host(const char *host, char *name, size_t len)
 	 * Canonicalize a hostname
 	 */
 
-	/* 1. remove repeated dots and convert upper case to lower case */	
+	/* 1. remove repeated dots and convert upper case to lower case */
 	plen = strlen(host);
 	bzero(name, len);
 	for (i = j = 0; i < plen; i++) {