From: des <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Wed, 20 Sep 2006 07:50:27 +0000 (+0000)
Subject: Whitespace, comment and attribution fixes.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a712ff8c112ac80effbe57e685a2b3bd86b4870;p=varnish

Whitespace, comment and attribution fixes.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1096 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index ac919910..e4ecc22b 100644
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
@@ -199,7 +198,7 @@ extern struct stevedore *stevedore;
 
 /* -------------------------------------------------------------------*/
 
-struct object {	
+struct object {
 	unsigned		magic;
 #define OBJECT_MAGIC		0x32851d42
 	unsigned 		refcnt;
diff --git a/varnish-cache/bin/varnishd/cache_acceptor.c b/varnish-cache/bin/varnishd/cache_acceptor.c
index 2a61164f..e554047f 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * XXX: We need to pass sessions back into the event engine when they are
diff --git a/varnish-cache/bin/varnishd/cache_acceptor.h b/varnish-cache/bin/varnishd/cache_acceptor.h
index 472da6a8..2ab7be57 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor.h
+++ b/varnish-cache/bin/varnishd/cache_acceptor.h
@@ -25,9 +25,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
- * $Id$ 
  *
+ * $Id$
  */
 
 struct sess;
diff --git a/varnish-cache/bin/varnishd/cache_acceptor_epoll.c b/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
index bde08bf8..3f795ca7 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
@@ -24,7 +24,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * XXX: We need to pass sessions back into the event engine when they are
diff --git a/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c b/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
index c25e2c9e..41545da8 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * XXX: We need to pass sessions back into the event engine when they are
@@ -150,7 +149,7 @@ vca_kqueue_main(void *arg)
 				continue;
 			if (kp->filter == EVFILT_TIMER) {
 				dotimer = 1;
-				continue; 
+				continue;
 			}
 			assert(kp->filter == EVFILT_READ);
 			vca_kev(kp);
@@ -163,7 +162,7 @@ vca_kqueue_main(void *arg)
 			sp = TAILQ_FIRST(&sesshead);
 			if (sp == NULL)
 				break;
-			if (sp->t_open.tv_sec > ts.tv_sec) 
+			if (sp->t_open.tv_sec > ts.tv_sec)
 				break;
 			if (sp->t_open.tv_sec == ts.tv_sec &&
 			    sp->t_open.tv_nsec > ts.tv_nsec)
@@ -196,7 +195,7 @@ vca_kqueue_init(void)
 	i = fcntl(pipes[0], F_GETFL);
 	i |= O_NONBLOCK;
 	i = fcntl(pipes[0], F_SETFL, i);
-	
+
 	AZ(pthread_create(&vca_kqueue_thread, NULL, vca_kqueue_main, NULL));
 }
 
diff --git a/varnish-cache/bin/varnishd/cache_acceptor_poll.c b/varnish-cache/bin/varnishd/cache_acceptor_poll.c
index f0b4dc8c..c6b3e505 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor_poll.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor_poll.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * XXX: We need to pass sessions back into the event engine when they are
@@ -74,7 +73,7 @@ vca_pollspace(int fd)
 	p = realloc(pollfd, u * sizeof *p);
 	XXXAN(p);	/* close offending fd */
 	memset(p + npoll, 0, (u - npoll) * sizeof *p);
-	for (v = npoll ; v <= u; v++) 
+	for (v = npoll ; v <= u; v++)
 		p->fd = -1;
 	pollfd = p;
 	npoll = u;
@@ -129,7 +128,7 @@ vca_main(void *arg)
 				break;
 			CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 			fd = sp->fd;
-		    	if (pollfd[fd].revents) {
+			if (pollfd[fd].revents) {
 				v--;
 				i = vca_pollsession(sp);
 				if (i < 0)
diff --git a/varnish-cache/bin/varnishd/cache_backend.c b/varnish-cache/bin/varnishd/cache_backend.c
index c966a42f..302531a3 100644
--- a/varnish-cache/bin/varnishd/cache_backend.c
+++ b/varnish-cache/bin/varnishd/cache_backend.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Manage backend connections.
@@ -120,12 +119,12 @@ vbe_sock_conn(const struct addrinfo *ai)
 	int s;
 
 	s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-	if (s < 0) 
+	if (s < 0)
 		return (s);
 	else if (connect(s, ai->ai_addr, ai->ai_addrlen)) {
 		AZ(close(s));
 		s = -1;
-	} 
+	}
 	return (s);
 }
 
@@ -185,7 +184,7 @@ vbe_connect(struct sess *sp, struct backend *bp)
 	AN(bp->hostname);
 
 	s = vbe_conn_try(bp, &ai);
-	if (s < 0) 
+	if (s < 0)
 		return (s);
 
 	TCP_myname(s, abuf1, sizeof abuf1, pbuf1, sizeof pbuf1);
diff --git a/varnish-cache/bin/varnishd/cache_ban.c b/varnish-cache/bin/varnishd/cache_ban.c
index ee594379..dea28288 100644
--- a/varnish-cache/bin/varnishd/cache_ban.c
+++ b/varnish-cache/bin/varnishd/cache_ban.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Ban processing
@@ -63,7 +62,7 @@ AddBan(const char *regexp)
 	i = regcomp(&b->regexp, regexp, REG_EXTENDED | REG_NOSUB);
 	if (i) {
 		char buf[512];
-	
+
 		(void)regerror(i, &b->regexp, buf, sizeof buf);
 		VSL(SLT_Debug, 0, "REGEX: <%s>", buf);
 	}
@@ -93,7 +92,7 @@ BAN_CheckObject(struct object *o, const char *url)
 		i = regexec(&b->regexp, url, 0, NULL, 0);
 		if (!i)
 			return (1);
-	} 
+	}
 	o->ban_seq = b0->gen;
 	return (0);
 }
diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index b8ca3314..fa3c12ca 100644
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * This file contains the central state machine for pushing requests.
@@ -41,7 +40,6 @@
  * extract the DOT lines and run though dot(1), for instance with the
  * command:
  *	sed -n '/^DOT/s///p' cache_center.c | dot -Tps > /tmp/_.ps
- *
  */
 
 /*
@@ -78,7 +76,7 @@ cnt_again(struct sess *sp)
 
 	assert(sp->xid == 0);
 
-	do 
+	do
 		i = http_RecvSome(sp->fd, sp->http);
 	while (i == -1);
 	if (i == 0) {
@@ -273,8 +271,8 @@ DOT	]
 DOT	vcl_fetch -> fetch_error [label="error"]
 DOT }
 DOT fetch_lookup -> LOOKUP [style=dotted, weight=0]
-DOT fetch_pass -> PASSBODY 
-DOT fetch_ipass -> PASSBODY 
+DOT fetch_pass -> PASSBODY
+DOT fetch_ipass -> PASSBODY
 DOT fetch_insert -> DELIVER [style=bold]
 DOT fetch_error -> ERROR
  */
@@ -350,7 +348,7 @@ cnt_first(struct sess *sp)
 	sp->wrk->idle = sp->t_open.tv_sec;
 	sp->wrk->acct.sess++;
 	SES_RefSrcAddr(sp);
-	do 
+	do
 		i = http_RecvSome(sp->fd, sp->http);
 	while (i == -1);
 	if (i == 0) {
@@ -476,7 +474,7 @@ cnt_lookup2(struct sess *sp)
 
 	/*
 	 * We don't assign to sp->obj directly because it is used
- 	 * to cache state when we encounter a busy object.
+	 * to cache state when we encounter a busy object.
 	 */
 	o = HSH_Lookup(sp);
 
@@ -611,7 +609,7 @@ cnt_pass(struct sess *sp)
 	if (!PassSession(sp)) {
 		AN(sp->vbc);
 		sp->step = STP_PASSBODY;
-	} else 
+	} else
 		sp->step = STP_DONE;
 	return (0);
 }
@@ -757,7 +755,7 @@ cnt_recv(struct sess *sp)
 
 /*--------------------------------------------------------------------
  * Central state engine dispatcher.
- * 
+ *
  * We grab a VCL reference, and keeps kicking the session around until
  * it has had enough.
  *
diff --git a/varnish-cache/bin/varnishd/cache_cli.c b/varnish-cache/bin/varnishd/cache_cli.c
index af32af76..c44f150c 100644
--- a/varnish-cache/bin/varnishd/cache_cli.c
+++ b/varnish-cache/bin/varnishd/cache_cli.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
@@ -91,7 +90,7 @@ CLI_Init(void)
 
 	cli = &clis;
 	memset(cli, 0, sizeof *cli);
-	
+
 	cli->sb = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
 	XXXAN(cli->sb);
 	lbuf = 4096;
@@ -133,7 +132,7 @@ CLI_Init(void)
 		}
 		VSL(SLT_CLI, 0, "Wr %d %d %s",
 		    i, cli->result, vsb_data(cli->sb));
-		i = ++p - buf; 
+		i = ++p - buf;
 		assert(i <= nbuf);
 		if (i < nbuf)
 			memcpy(buf, p, nbuf - i);
diff --git a/varnish-cache/bin/varnishd/cache_expire.c b/varnish-cache/bin/varnishd/cache_expire.c
index 4761b5e3..387142f4 100644
--- a/varnish-cache/bin/varnishd/cache_expire.c
+++ b/varnish-cache/bin/varnishd/cache_expire.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Expiry of cached objects and execution of prefetcher
@@ -87,7 +86,7 @@ exp_hangman(void *arg)
 
 	(void)arg;
 
-	t = time(NULL); 
+	t = time(NULL);
 	while (1) {
 		LOCK(&exp_mtx);
 		TAILQ_FOREACH(o, &exp_deathrow, deathrow) {
@@ -107,7 +106,7 @@ exp_hangman(void *arg)
 		if (o == NULL) {
 			UNLOCK(&exp_mtx);
 			AZ(sleep(1));
-			t = time(NULL); 
+			t = time(NULL);
 			continue;
 		}
 		TAILQ_REMOVE(&exp_deathrow, o, deathrow);
diff --git a/varnish-cache/bin/varnishd/cache_fetch.c b/varnish-cache/bin/varnishd/cache_fetch.c
index 4fe8bd09..d1889455 100644
--- a/varnish-cache/bin/varnishd/cache_fetch.c
+++ b/varnish-cache/bin/varnishd/cache_fetch.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
@@ -133,7 +132,7 @@ fetch_chunked(const struct sess *sp, int fd, struct http *hp)
 			/* Get some storage if we don't have any */
 			if (st == NULL || st->len == st->space) {
 				v = u;
-				if (u < params->fetch_chunksize * 1024 && 
+				if (u < params->fetch_chunksize * 1024 &&
 				    stevedore->trim != NULL)
 					v = params->fetch_chunksize * 1024;
 				st = stevedore->alloc(stevedore, v);
@@ -269,13 +268,13 @@ FetchBody(struct sess *sp)
 	hp->logtag = HTTP_Obj;
 	http_CopyResp(sp->wrk, sp->fd, hp, vc->http);
 	http_FilterHeader(sp->wrk, sp->fd, hp, vc->http, HTTPH_A_INS);
-	
+
 	if (body) {
 		if (http_GetHdr(vc->http, H_Content_Length, &b))
 			cls = fetch_straight(sp, vc->fd, vc->http, b);
 		else if (http_HdrIs(vc->http, H_Transfer_Encoding, "chunked"))
 			cls = fetch_chunked(sp, vc->fd, vc->http);
-		else 
+		else
 			cls = fetch_eof(sp, vc->fd, vc->http);
 		http_PrintfHeader(sp->wrk, sp->fd, hp,
 		    "Content-Length: %u", sp->obj->len);
diff --git a/varnish-cache/bin/varnishd/cache_hash.c b/varnish-cache/bin/varnishd/cache_hash.c
index 9376b14a..711a878a 100644
--- a/varnish-cache/bin/varnishd/cache_hash.c
+++ b/varnish-cache/bin/varnishd/cache_hash.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * This is the central hash-table code, it relies on a chosen hash
@@ -51,7 +50,6 @@
  *
  * New objects are always marked busy, and they can go from busy to
  * not busy only once.
- *
  */
 
 #include <stdio.h>
@@ -141,7 +139,7 @@ HSH_Lookup(struct sess *sp)
 			o->ttl = 0;
 			VSL(SLT_ExpBan, 0, "%u was banned", o->xid);
 			EXP_TTLchange(o);
-		} else 
+		} else
 			break;
 		o->refcnt--;
 	}
diff --git a/varnish-cache/bin/varnishd/cache_http.c b/varnish-cache/bin/varnishd/cache_http.c
index 428a5c0a..678dbe29 100644
--- a/varnish-cache/bin/varnishd/cache_http.c
+++ b/varnish-cache/bin/varnishd/cache_http.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * HTTP request storage and manipulation
@@ -268,7 +267,7 @@ http_GetTail(struct http *hp, unsigned len, char **b, char **e)
 
 	if (hp->t + len > hp->v)
 		len = hp->v - hp->t;
-	if (len == 0) 
+	if (len == 0)
 		return (0);
 	*b = hp->t;
 	*e = hp->t + len;
@@ -347,7 +346,7 @@ http_dissect_hdrs(struct worker *w, struct http *hp, int fd, char *p)
 
 		if ((p[0] == 'i' || p[0] == 'I') &&
 		    (p[1] == 'f' || p[1] == 'F') &&
-		    p[2] == '-') 
+		    p[2] == '-')
 			hp->conds = 1;
 
 		if (hp->nhd < HTTP_HDR_MAX) {
@@ -583,7 +582,7 @@ http_RecvSome(int fd, struct http *hp)
 		if (http_header_complete(hp))
 			return(0);
 		return (-1);
-	} 
+	}
 
 	if (hp->v != hp->s) {
 		VSL(SLT_HttpError, fd,
@@ -608,7 +607,7 @@ http_RecvHead(struct http *hp, int fd)
 
 	CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC);
 	http_RecvPrep(hp);
-	do 
+	do
 		i = http_RecvSome(fd, hp);
 	while (i == -1);
 	return (i);
diff --git a/varnish-cache/bin/varnishd/cache_main.c b/varnish-cache/bin/varnishd/cache_main.c
index d272c9f5..39b79393 100644
--- a/varnish-cache/bin/varnishd/cache_main.c
+++ b/varnish-cache/bin/varnishd/cache_main.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/bin/varnishd/cache_pass.c b/varnish-cache/bin/varnishd/cache_pass.c
index 90161e35..86ec8d63 100644
--- a/varnish-cache/bin/varnishd/cache_pass.c
+++ b/varnish-cache/bin/varnishd/cache_pass.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * XXX: charge bytes to srcaddr
diff --git a/varnish-cache/bin/varnishd/cache_pipe.c b/varnish-cache/bin/varnishd/cache_pipe.c
index c75f2faa..c2cf1116 100644
--- a/varnish-cache/bin/varnishd/cache_pipe.c
+++ b/varnish-cache/bin/varnishd/cache_pipe.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * XXX: charge bytes to srcaddr
diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 22b2a841..11b9a303 100644
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * XXX: automatic thread-pool size adaptation.
@@ -111,7 +110,7 @@ unsigned
 WRK_WriteH(struct worker *w, struct http_hdr *hh, const char *suf)
 {
 	unsigned u;
-	
+
 	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
 	AN(w);
 	AN(hh);
@@ -235,7 +234,7 @@ wrk_thread(void *priv)
 			}
 			UNLOCK(&tmtx);
 		}
-		
+
 		LOCK(&qp->mtx);
 		TAILQ_INSERT_HEAD(&qp->idle, w, list);
 		assert(w->idle != 0);
@@ -292,7 +291,7 @@ WRK_QueueSession(struct sess *sp)
 		assert(1 == write(w->pipe[1], w, 1));
 		return;
 	}
-	
+
 	UNLOCK(&qp->mtx);
 
 	LOCK(&tmtx);
@@ -306,7 +305,7 @@ WRK_QueueSession(struct sess *sp)
 	}
 	/*
 	 * XXX: If there are too many requests in the overflow queue
-	 * XXX: we should kill the request right here. 
+	 * XXX: we should kill the request right here.
 	 * XXX: Not sure how though.  Simply closing may be the better
 	 * XXX: compromise.
 	 */
@@ -371,7 +370,7 @@ wrk_addpools(unsigned t)
 }
 
 /*--------------------------------------------------------------------*/
-	
+
 static void *
 wrk_reaperthread(void *priv)
 {
@@ -385,7 +384,7 @@ wrk_reaperthread(void *priv)
 		wrk_addpools(params->wthread_pools);
 		sleep(1);
 		if (VSL_stats->n_wrk <= params->wthread_min)
-			continue; 
+			continue;
 		now = time(NULL);
 		for (u = 0; u < nwq; u++) {
 			qp = wq[u];
@@ -395,7 +394,7 @@ wrk_reaperthread(void *priv)
 			   (w->idle + params->wthread_timeout < now ||
 			    VSL_stats->n_wrk > params->wthread_max))
 				TAILQ_REMOVE(&qp->idle, w, list);
-			else 
+			else
 				w = NULL;
 			UNLOCK(&qp->mtx);
 			if (w == NULL)
diff --git a/varnish-cache/bin/varnishd/cache_response.c b/varnish-cache/bin/varnishd/cache_response.c
index c1b75124..2b8b9da4 100644
--- a/varnish-cache/bin/varnishd/cache_response.c
+++ b/varnish-cache/bin/varnishd/cache_response.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
@@ -116,7 +115,7 @@ RES_Error(struct sess *sp, int code, const char *expl)
 			expl = mp->expl;
 		break;
 	}
-	if (expl == NULL) 
+	if (expl == NULL)
 		expl = msg;
 	AN(expl);
 	AN(msg);
@@ -216,13 +215,13 @@ RES_WriteObj(struct sess *sp)
 {
 	struct storage *st;
 	unsigned u = 0;
-	
+
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	clock_gettime(CLOCK_REALTIME, &sp->t_resp);
 
 	if (sp->obj->response == 200 && sp->http->conds && res_do_conds(sp))
 		return;
-		
+
 	WSL(sp->wrk, SLT_Length, sp->fd, "%u", sp->obj->len);
 
 	http_ClrHeader(sp->http);
@@ -242,7 +241,7 @@ RES_WriteObj(struct sess *sp)
 	WRK_Reset(sp->wrk, &sp->fd);
 	sp->wrk->acct.hdrbytes += http_Write(sp->wrk, sp->http, 1);
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	
+
 	if (sp->wantbody) {
 		TAILQ_FOREACH(st, &sp->obj->store, list) {
 			CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
diff --git a/varnish-cache/bin/varnishd/cache_session.c b/varnish-cache/bin/varnishd/cache_session.c
index 6557ae49..942a61b1 100644
--- a/varnish-cache/bin/varnishd/cache_session.c
+++ b/varnish-cache/bin/varnishd/cache_session.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Session and Client management.
@@ -42,8 +41,8 @@
  * XXX: The two-list session management is actually not a good idea
  * XXX: come to think of it, because we want the sessions reused in
  * XXX: Most Recently Used order.
- * XXX: Another and maybe more interesting option would be to cache 
- * XXX: free sessions in the worker threads and postpone session 
+ * XXX: Another and maybe more interesting option would be to cache
+ * XXX: free sessions in the worker threads and postpone session
  * XXX: allocation until then.  This does not quite implment MRU order
  * XXX: but it does save some locking, although not that much because
  * XXX: we still have to do the source-addr lookup.
@@ -103,7 +102,7 @@ static struct srcaddrhead {
 	TAILQ_HEAD(,srcaddr)	head;
 	MTX			mtx;
 } *srchash;
-	
+
 static unsigned			nsrchash;
 static MTX			stat_mtx;
 
@@ -320,7 +319,7 @@ SES_Delete(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	sm = sp->mem;
 	CHECK_OBJ_NOTNULL(sm, SESSMEM_MAGIC);
-	
+
 	AZ(sp->obj);
 	AZ(sp->vcl);
 	VSL_stats->n_sess--;
@@ -329,7 +328,7 @@ SES_Delete(struct sess *sp)
 	    sp->addr, sp->port, sp->t_end.tv_sec - b->first,
 	    b->sess, b->req, b->pipe, b->pass,
 	    b->fetch, b->hdrbytes, b->bodybytes);
-	if (sm->workspace != params->mem_workspace) { 
+	if (sm->workspace != params->mem_workspace) {
 		VSL_stats->n_sess_mem--;
 		free(sm);
 	} else {
diff --git a/varnish-cache/bin/varnishd/cache_vcl.c b/varnish-cache/bin/varnishd/cache_vcl.c
index 67d2dcd0..0ea9830e 100644
--- a/varnish-cache/bin/varnishd/cache_vcl.c
+++ b/varnish-cache/bin/varnishd/cache_vcl.c
@@ -26,13 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Interface *to* compiled VCL code:  Loading, unloading, calling into etc.
  *
  * The interface *from* the compiled VCL code is in cache_vrt.c.
- *
  */
 
 #include <stdio.h>
@@ -140,7 +138,7 @@ VCL_Load(const char *fn, const char *name, struct cli *cli)
 	if (vcl != NULL) {
 		if (cli == NULL)
 			fprintf(stderr, "Config '%s' already loaded", name);
-		else 
+		else
 			cli_out(cli, "Config '%s' already loaded", name);
 		return (1);
 	}
@@ -162,7 +160,7 @@ VCL_Load(const char *fn, const char *name, struct cli *cli)
 	if (vcl->conf == NULL) {
 		if (cli == NULL)
 			fprintf(stderr, "No VCL_conf symbol\n");
-		else 
+		else
 			cli_out(cli, "No VCL_conf symbol\n");
 		(void)dlclose(vcl->dlh);
 		free(vcl);
@@ -170,7 +168,7 @@ VCL_Load(const char *fn, const char *name, struct cli *cli)
 	}
 
 	if (vcl->conf->magic != VCL_CONF_MAGIC) {
-		if (cli == NULL) 
+		if (cli == NULL)
 			fprintf(stderr, "Wrong VCL_CONF_MAGIC\n");
 		else
 			cli_out(cli, "Wrong VCL_CONF_MAGIC\n");
@@ -188,7 +186,7 @@ VCL_Load(const char *fn, const char *name, struct cli *cli)
 	UNLOCK(&vcl_mtx);
 	if (cli == NULL)
 		fprintf(stderr, "Loaded \"%s\" as \"%s\"\n", fn , name);
-	else 
+	else
 		cli_out(cli, "Loaded \"%s\" as \"%s\"\n", fn , name);
 	vcl->conf->init_func();
 	return (0);
diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index 28d1aa34..93638486 100644
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Runtime support for compiled VCL programs
@@ -48,7 +47,7 @@
 
 void
 VRT_error(struct sess *sp, unsigned code, const char *expl)
-{ 
+{
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	WSL(sp->wrk, SLT_Debug, 0, "VCL_error(%u, %s)", code, expl);
@@ -61,7 +60,7 @@ VRT_error(struct sess *sp, unsigned code, const char *expl)
 void
 VRT_count(struct sess *sp, unsigned u)
 {
-	
+
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	if (params->vcl_trace)
 		WSL(sp->wrk, SLT_VCL_trace, sp->fd, "%u %d.%d", u,
diff --git a/varnish-cache/bin/varnishd/cache_vrt_acl.c b/varnish-cache/bin/varnishd/cache_vrt_acl.c
index 2797e666..9ce33085 100644
--- a/varnish-cache/bin/varnishd/cache_vrt_acl.c
+++ b/varnish-cache/bin/varnishd/cache_vrt_acl.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Runtime support for compiled VCL programs, ACLs
@@ -52,10 +51,10 @@
 static uint32_t ipv4mask[] = {
 	[0]	=	0xffffffff,
 #define M(n)	[n] = (uint32_t)((uint64_t)0xffffffff << (32 - n))
-        M( 1), M( 2), M( 3), M( 4), M( 5), M( 6), M( 7), M( 8), M( 9), M(10),
-        M(11), M(12), M(13), M(14), M(15), M(16), M(17), M(18), M(19), M(20),
-        M(21), M(22), M(23), M(24), M(25), M(26), M(27), M(28), M(29), M(30),
-        M(31), M(32)
+	M( 1), M( 2), M( 3), M( 4), M( 5), M( 6), M( 7), M( 8), M( 9), M(10),
+	M(11), M(12), M(13), M(14), M(15), M(16), M(17), M(18), M(19), M(20),
+	M(21), M(22), M(23), M(24), M(25), M(26), M(27), M(28), M(29), M(30),
+	M(31), M(32)
 };
 
 static int
@@ -73,7 +72,7 @@ vrt_acl_vsl(struct sess *sp, const char *acl, struct vrt_acl *ap, int r)
 		VSL(SLT_VCL_acl, sp->fd, "FAIL %s %s", acl, ap->desc);
 		return (r);
 	}
-	
+
 	VSL(SLT_VCL_acl, sp->fd, "%s %s %s",
 		r ? "MATCH" : "NEG_MATCH", acl, ap->desc);
 	return (r);
@@ -91,7 +90,7 @@ VRT_acl_match(struct sess *sp, const char *acl, struct vrt_acl *ap)
 	} else {
 		sin1 = NULL;
 	}
-	
+
 	for ( ; ap->name != NULL; ap++) {
 		if (ap->priv == NULL && ap->paren)
 			continue;
@@ -142,7 +141,7 @@ VRT_acl_init(struct vrt_acl *ap)
 		if (i != 0) {
 			fprintf(stderr, "getaddrinfo(%s) = %s\n",
 			    ap->name, gai_strerror(i));
-			if (a1 != NULL) 
+			if (a1 != NULL)
 				freeaddrinfo(a1);
 			a1 = NULL;
 		}
diff --git a/varnish-cache/bin/varnishd/cache_vrt_re.c b/varnish-cache/bin/varnishd/cache_vrt_re.c
index 0b2656dc..5318bb0d 100644
--- a/varnish-cache/bin/varnishd/cache_vrt_re.c
+++ b/varnish-cache/bin/varnishd/cache_vrt_re.c
@@ -26,11 +26,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Runtime support for compiled VCL programs, regexps
- *
  */
 
 #include <stdio.h>
@@ -85,7 +83,7 @@ int
 VRT_re_test(struct vsb *sb, const char *re)
 {
 	int i;
-	regex_t	t;	
+	regex_t	t;
 	char buf[BUFSIZ];
 
 	memset(&t, 0, sizeof t);
diff --git a/varnish-cache/bin/varnishd/common.h b/varnish-cache/bin/varnishd/common.h
index ab0e1b68..a46f36b0 100644
--- a/varnish-cache/bin/varnishd/common.h
+++ b/varnish-cache/bin/varnishd/common.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/bin/varnishd/hash_classic.c b/varnish-cache/bin/varnishd/hash_classic.c
index cd9e2633..72e60720 100644
--- a/varnish-cache/bin/varnishd/hash_classic.c
+++ b/varnish-cache/bin/varnishd/hash_classic.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * A classic bucketed hash
@@ -93,7 +92,7 @@ hcl_init(const char *p)
 }
 
 /*--------------------------------------------------------------------
- * The ->start method is called during cache process start and allows 
+ * The ->start method is called during cache process start and allows
  * initialization to happen before the first lookup.
  */
 
diff --git a/varnish-cache/bin/varnishd/hash_simple_list.c b/varnish-cache/bin/varnishd/hash_simple_list.c
index 8c23fb59..a5785a70 100644
--- a/varnish-cache/bin/varnishd/hash_simple_list.c
+++ b/varnish-cache/bin/varnishd/hash_simple_list.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * This is the reference hash(/lookup) implementation
@@ -53,7 +52,7 @@ static TAILQ_HEAD(, hsl_entry)	hsl_head = TAILQ_HEAD_INITIALIZER(hsl_head);
 static MTX hsl_mutex;
 
 /*--------------------------------------------------------------------
- * The ->init method is called during process start and allows 
+ * The ->init method is called during process start and allows
  * initialization to happen before the first lookup.
  */
 
@@ -82,12 +81,12 @@ hsl_lookup(const char *key1, const char *key2, struct objhead *nobj)
 		i = strcmp(key1, he->key1);
 		if (i < 0)
 			continue;
-		if (i > 0) 
+		if (i > 0)
 			break;
 		i = strcmp(key2, he->key2);
 		if (i < 0)
 			continue;
-		if (i > 0) 
+		if (i > 0)
 			break;
 		he->refcnt++;
 		nobj = he->obj;
diff --git a/varnish-cache/bin/varnishd/hash_slinger.h b/varnish-cache/bin/varnishd/hash_slinger.h
index 620c3a6a..e731d872 100644
--- a/varnish-cache/bin/varnishd/hash_slinger.h
+++ b/varnish-cache/bin/varnishd/hash_slinger.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/bin/varnishd/heritage.h b/varnish-cache/bin/varnishd/heritage.h
index e6a6fecc..25609c3e 100644
--- a/varnish-cache/bin/varnishd/heritage.h
+++ b/varnish-cache/bin/varnishd/heritage.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * This file contains the heritage passed when mgt forks cache
diff --git a/varnish-cache/bin/varnishd/mgt.h b/varnish-cache/bin/varnishd/mgt.h
index b5a773f0..eb53e725 100644
--- a/varnish-cache/bin/varnishd/mgt.h
+++ b/varnish-cache/bin/varnishd/mgt.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/bin/varnishd/mgt_child.c b/varnish-cache/bin/varnishd/mgt_child.c
index 3f30fe55..4e85bbda 100644
--- a/varnish-cache/bin/varnishd/mgt_child.c
+++ b/varnish-cache/bin/varnishd/mgt_child.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * The mechanics of handling the child process
@@ -147,7 +146,7 @@ start_child(void)
 	AZ(pipe(&heritage.fds[2]));
 	AZ(pipe(child_fds));
 	i = fork();
-	if (i < 0) 
+	if (i < 0)
 		errx(1, "Could not fork child");
 	if (i == 0) {
 		/* Redirect stdin/out/err */
diff --git a/varnish-cache/bin/varnishd/mgt_cli.c b/varnish-cache/bin/varnishd/mgt_cli.c
index 84b823e8..08adbb67 100644
--- a/varnish-cache/bin/varnishd/mgt_cli.c
+++ b/varnish-cache/bin/varnishd/mgt_cli.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * The management process' CLI handling
diff --git a/varnish-cache/bin/varnishd/mgt_cli.h b/varnish-cache/bin/varnishd/mgt_cli.h
index d3064307..90e7ca3c 100644
--- a/varnish-cache/bin/varnishd/mgt_cli.h
+++ b/varnish-cache/bin/varnishd/mgt_cli.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/bin/varnishd/mgt_event.c b/varnish-cache/bin/varnishd/mgt_event.c
index b1b97927..b98bdaad 100644
--- a/varnish-cache/bin/varnishd/mgt_event.c
+++ b/varnish-cache/bin/varnishd/mgt_event.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
@@ -117,7 +116,7 @@ ev_get_pfd(struct evbase *evb)
 	unsigned u;
 	void *p;
 
-	if (evb->lpfd < evb->npfd) 
+	if (evb->lpfd < evb->npfd)
 		return (0);
 
 	if (evb->npfd > 256)
@@ -141,7 +140,7 @@ ev_get_sig(int sig)
 {
 	struct evsig *os;
 
-	if (sig < ev_nsig) 
+	if (sig < ev_nsig)
 		return (0);
 
 	os = calloc(sizeof *os, (sig + 1));
@@ -337,7 +336,7 @@ ev_schedule(struct evbase *evb)
 	int i;
 
 	CHECK_OBJ_NOTNULL(evb, EVBASE_MAGIC);
-	do 
+	do
 		i = ev_schedule_one(evb);
 	while (i == 1);
 	return (i);
@@ -360,7 +359,7 @@ ev_compact_pfd(struct evbase *evb)
 		for(; ep != NULL; ep = TAILQ_NEXT(ep, __list)) {
 			if (ep->fd >= 0 && ep->__poll_idx > u)
 				break;
-		} 
+		}
 		if (ep == NULL)
 			break;
 		*p = evb->pfd[ep->__poll_idx];
diff --git a/varnish-cache/bin/varnishd/mgt_event.h b/varnish-cache/bin/varnishd/mgt_event.h
index 9023db87..46385b7d 100644
--- a/varnish-cache/bin/varnishd/mgt_event.h
+++ b/varnish-cache/bin/varnishd/mgt_event.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * $Id$
- *
  */
 
 #include <poll.h>
diff --git a/varnish-cache/bin/varnishd/mgt_param.c b/varnish-cache/bin/varnishd/mgt_param.c
index f84ce0fe..fd01c1e3 100644
--- a/varnish-cache/bin/varnishd/mgt_param.c
+++ b/varnish-cache/bin/varnishd/mgt_param.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
@@ -116,12 +115,12 @@ tweak_generic_uint(struct cli *cli, unsigned *dest, const char *arg, unsigned mi
 			u = strtoul(arg, NULL, 0);
 		if (u < min) {
 			cli_out(cli, "Must be at least %u", min);
-			cli_result(cli, CLIS_PARAM);	
+			cli_result(cli, CLIS_PARAM);
 			return;
 		}
 		if (u > max) {
 			cli_out(cli, "Must be no more than %u", max);
-			cli_result(cli, CLIS_PARAM);	
+			cli_result(cli, CLIS_PARAM);
 			return;
 		}
 		*dest = u;
@@ -304,7 +303,7 @@ tweak_listen_address(struct cli *cli, struct parspec *par, const char *arg)
 		AN(params->listen_address);
 		params->listen_host = a;
 		params->listen_port = p;
-	} else 
+	} else
 		cli_out(cli, "%s", params->listen_address);
 }
 
@@ -431,7 +430,7 @@ static struct parspec parspec[] = {
 	{ "pipe_timeout", tweak_pipe_timeout,
 		"Idle timeout for PIPE sessions. "
 		"If nothing have been received in either direction for "
-	        "this many seconds, the session is closed.\n",
+		"this many seconds, the session is closed.\n",
 		"60", "seconds" },
 	{ "send_timeout", tweak_send_timeout,
 		"Send timeout for client connections. "
@@ -535,7 +534,7 @@ mcf_param_show(struct cli *cli, char **av, void *priv)
 		cli_out(cli, "%-20s ", pp->name);
 		if (pp->func == NULL) {
 			cli_out(cli, "Not implemented.\n");
-			if (av[2] != NULL && !lfmt) 
+			if (av[2] != NULL && !lfmt)
 				return;
 			else
 				continue;
diff --git a/varnish-cache/bin/varnishd/mgt_vcc.c b/varnish-cache/bin/varnishd/mgt_vcc.c
index 2ec1f8ee..576aac21 100644
--- a/varnish-cache/bin/varnishd/mgt_vcc.c
+++ b/varnish-cache/bin/varnishd/mgt_vcc.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * VCL compiler stuff
@@ -171,7 +170,7 @@ mgt_vcc_default(const char *b_arg, const char *f_arg)
 			fprintf(stderr, "invalid backend address\n");
 			return (1);
 		}
-		
+
 		buf = NULL;
 		asprintf(&buf,
 		    "backend default {\n"
diff --git a/varnish-cache/bin/varnishd/rfc2616.c b/varnish-cache/bin/varnishd/rfc2616.c
index f492382a..fdfc3d5f 100644
--- a/varnish-cache/bin/varnishd/rfc2616.c
+++ b/varnish-cache/bin/varnishd/rfc2616.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
@@ -66,35 +65,35 @@
  */
 
 #if PSEUDO_CODE
- 	/* Marker for no retirement age determined */
- 	retirement_age = INT_MAX
-
- 	/* If we have a max-age directive, respect it */
- 	if (max-age)
- 		retirement_age = max(0,min(retirement_age, max-age - Age:))
- 
- 	/* If Date: is not in future and Expires: looks sensible, use it */
- 	if ((!date || date < our_clock) && expires > our_clock) {
- 		ttd = min(our_clock + retirement_age, Expires:)
-  
- 	/* Otherwise we have clock-skew */
- 	} else {
- 		/* If we have both date and expires, infer max-age */
- 		if (date && expires)
- 			retirement_age =
- 			    max(0, min(retirement_age, Expires: - Date:)
-  
- 		/* Apply default_ttl if nothing better found */
- 		if (retirement_age == INT_MAX)
- 			retirement_age = default_ttl
-  
- 		/* Apply the max-age we can up with */
- 		ttd = our_clock + retirement_age
- 	}
-  
- 	/* Apply hard limits */
- 	ttd = max(ttd, our_clock + hard_lower_ttl)
- 	ttd = min(ttd, our_clock + hard_upper_ttl)
+	/* Marker for no retirement age determined */
+	retirement_age = INT_MAX
+
+	/* If we have a max-age directive, respect it */
+	if (max-age)
+		retirement_age = max(0,min(retirement_age, max-age - Age:))
+
+	/* If Date: is not in future and Expires: looks sensible, use it */
+	if ((!date || date < our_clock) && expires > our_clock) {
+		ttd = min(our_clock + retirement_age, Expires:)
+
+	/* Otherwise we have clock-skew */
+	} else {
+		/* If we have both date and expires, infer max-age */
+		if (date && expires)
+			retirement_age =
+			    max(0, min(retirement_age, Expires: - Date:)
+
+		/* Apply default_ttl if nothing better found */
+		if (retirement_age == INT_MAX)
+			retirement_age = default_ttl
+
+		/* Apply the max-age we can up with */
+		ttd = our_clock + retirement_age
+	}
+
+	/* Apply hard limits */
+	ttd = max(ttd, our_clock + hard_lower_ttl)
+	ttd = min(ttd, our_clock + hard_upper_ttl)
 #endif
 
 static time_t
@@ -104,7 +103,7 @@ RFC2616_Ttl(struct sess *sp, struct http *hp, struct object *obj)
 	unsigned u1, u2;
 	time_t h_date, h_expires, ttd;
 	char *p;
-	
+
 	retirement_age = INT_MAX;
 
 	u1 = u2 = 0;
diff --git a/varnish-cache/bin/varnishd/shmlog.c b/varnish-cache/bin/varnishd/shmlog.c
index 023017e8..a5cf9798 100644
--- a/varnish-cache/bin/varnishd/shmlog.c
+++ b/varnish-cache/bin/varnishd/shmlog.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
@@ -51,7 +50,7 @@
 			VSL_stats->shm_cont++;		\
 		}					\
 	} while (0);
-		
+
 #define UNLOCKSHM(foo)	AZ(pthread_mutex_unlock(foo))
 
 #ifndef MAP_HASSEMAPHORE
@@ -82,7 +81,7 @@ vsl_wrap(void)
 }
 
 /*--------------------------------------------------------------------*/
- 
+
 void
 VSLR(enum shmlogtag tag, unsigned id, const char *b, const char *e)
 {
@@ -102,8 +101,8 @@ VSLR(enum shmlogtag tag, unsigned id, const char *b, const char *e)
 
 	/* Only hold the lock while we find our space */
 	LOCKSHM(&vsl_mtx);
-	VSL_stats->shm_writes++;	
-	VSL_stats->shm_records++;	
+	VSL_stats->shm_writes++;
+	VSL_stats->shm_records++;
 	assert(loghead->ptr < loghead->size);
 
 	/* Wrap if necessary */
@@ -141,12 +140,12 @@ VSL(enum shmlogtag tag, unsigned id, const char *fmt, ...)
 	}
 
 	LOCKSHM(&vsl_mtx);
-	VSL_stats->shm_writes++;	
-	VSL_stats->shm_records++;	
+	VSL_stats->shm_writes++;
+	VSL_stats->shm_records++;
 	assert(loghead->ptr < loghead->size);
 
 	/* Wrap if we cannot fit a full size record */
-	if (loghead->ptr + 5 + 255 + 1 >= loghead->size) 
+	if (loghead->ptr + 5 + 255 + 1 >= loghead->size)
 		vsl_wrap();
 
 	p = logstart + loghead->ptr;
@@ -165,7 +164,7 @@ VSL(enum shmlogtag tag, unsigned id, const char *fmt, ...)
 
 	loghead->ptr += 5 + n;
 	assert(loghead->ptr < loghead->size);
-	
+
 	UNLOCKSHM(&vsl_mtx);
 
 	va_end(ap);
@@ -184,7 +183,7 @@ WSL_Flush(struct worker *w)
 		return;
 	l = w->wlp - w->wlog;
 	LOCKSHM(&vsl_mtx);
-	VSL_stats->shm_writes++;	
+	VSL_stats->shm_writes++;
 	VSL_stats->shm_records += w->wlr;
 	if (loghead->ptr + l + 1 >= loghead->size)
 		vsl_wrap();
@@ -200,7 +199,7 @@ WSL_Flush(struct worker *w)
 }
 
 /*--------------------------------------------------------------------*/
- 
+
 void
 WSLR(struct worker *w, enum shmlogtag tag, unsigned id, const char *b, const char *e)
 {
diff --git a/varnish-cache/bin/varnishd/steps.h b/varnish-cache/bin/varnishd/steps.h
index 4761720c..5649cda2 100644
--- a/varnish-cache/bin/varnishd/steps.h
+++ b/varnish-cache/bin/varnishd/steps.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * $Id$
- *
  */
 
 STEP(again,	AGAIN)
diff --git a/varnish-cache/bin/varnishd/stevedore.h b/varnish-cache/bin/varnishd/stevedore.h
index dbf983f0..beee4c7d 100644
--- a/varnish-cache/bin/varnishd/stevedore.h
+++ b/varnish-cache/bin/varnishd/stevedore.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/bin/varnishd/storage_file.c b/varnish-cache/bin/varnishd/storage_file.c
index 0633b6f4..a48a7169 100644
--- a/varnish-cache/bin/varnishd/storage_file.c
+++ b/varnish-cache/bin/varnishd/storage_file.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Storage method based on mmap'ed file
@@ -69,7 +68,7 @@
 
 /*
  * Number of buckets on free-list.
- * 
+ *
  * Last bucket is "larger than" so choose number so that the second
  * to last bucket matches the 128k CHUNKSIZE in cache_fetch.c when
  * using the a 4K minimal page size
@@ -150,7 +149,7 @@ smf_calcsize(struct smf_sc *sc, const char *size, int newfile)
 		l = st.st_size;
 
 	/* We must have at least one block */
-	if (l < bs) {	
+	if (l < bs) {
 		if (i == -1) {
 			fprintf(stderr,
 			    "Info: (-sfile) default to 80%% size\n");
@@ -436,7 +435,7 @@ alloc_smf(struct smf_sc *sc, size_t bytes)
 }
 
 /*--------------------------------------------------------------------
- * Free a range.  Attemt merge forward and backward, then sort into 
+ * Free a range.  Attemt merge forward and backward, then sort into
  * free list according to age.
  */
 
@@ -551,7 +550,7 @@ new_smf(struct smf_sc *sc, unsigned char *ptr, off_t off, size_t len)
 
 /*
  * XXX: This may be too aggressive and soak up too much address room.
- * XXX: On the other hand, the user, directly or implicitly asked us to 
+ * XXX: On the other hand, the user, directly or implicitly asked us to
  * XXX: use this much storage, so we should make a decent effort.
  * XXX: worst case (I think), malloc will fail.
  */
diff --git a/varnish-cache/bin/varnishd/storage_malloc.c b/varnish-cache/bin/varnishd/storage_malloc.c
index 5d4ed5cb..2a24fc25 100644
--- a/varnish-cache/bin/varnishd/storage_malloc.c
+++ b/varnish-cache/bin/varnishd/storage_malloc.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Storage method based on malloc(3)
diff --git a/varnish-cache/bin/varnishd/tcp.c b/varnish-cache/bin/varnishd/tcp.c
index e900e8a7..ea8b4a94 100644
--- a/varnish-cache/bin/varnishd/tcp.c
+++ b/varnish-cache/bin/varnishd/tcp.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index 9ff5f6ef..15d23e7b 100644
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * The management process and CLI handling
@@ -382,7 +381,7 @@ main(int argc, char *argv[])
 	heritage.socket = -1;
 	memset(&param, 0, sizeof param);
 	params = &param;
-	mgt_vcc_init(); 
+	mgt_vcc_init();
 
 	MCF_ParamInit(cli);
 	cli_check(cli);
diff --git a/varnish-cache/bin/varnishhist/varnishhist.c b/varnish-cache/bin/varnishhist/varnishhist.c
index 48613ae5..42e63e89 100644
--- a/varnish-cache/bin/varnishhist/varnishhist.c
+++ b/varnish-cache/bin/varnishhist/varnishhist.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Log tailer for Varnish
@@ -112,12 +111,12 @@ r_hist(void)
 	alarm(delay);
 }
 
-static int 
+static int
 h_hist(void *priv, unsigned tag, unsigned fd, unsigned len, unsigned spec, const char *ptr)
 {
 	double b;
 	int i, j;
-	
+
 	(void)priv;
 	(void)fd;
 	(void)len;
@@ -184,7 +183,7 @@ main(int argc, char **argv)
 	struct VSL_data *vd;
 
 	vd = VSL_New();
-	
+
 	while ((c = getopt(argc, argv, VSL_ARGS "Vw:")) != -1) {
 		switch (c) {
 		case 'V':
@@ -225,7 +224,7 @@ main(int argc, char **argv)
 		i = VSL_Dispatch(vd, h_hist, NULL);
 		if (i < 0)
 			break;
-	} 
+	}
 
 	return (0);
 }
diff --git a/varnish-cache/bin/varnishlog/varnishlog.c b/varnish-cache/bin/varnishlog/varnishlog.c
index c5a44229..b9775f5a 100644
--- a/varnish-cache/bin/varnishlog/varnishlog.c
+++ b/varnish-cache/bin/varnishlog/varnishlog.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Log tailer for Varnish
@@ -94,7 +93,7 @@ printf("Clean\n");
 	}
 }
 
-static int 
+static int
 h_order(void *priv, unsigned tag, unsigned fd, unsigned len, unsigned spec, const char *ptr)
 {
 
@@ -195,7 +194,7 @@ do_order(struct VSL_data *vd, int argc, char **argv)
 		}
 		else if (i < 0)
 			break;
-	} 
+	}
 	clean_order();
 }
 
@@ -250,7 +249,7 @@ main(int argc, char **argv)
 	struct VSL_data *vd;
 
 	vd = VSL_New();
-	
+
 	while ((c = getopt(argc, argv, VSL_ARGS "aoVw:")) != -1) {
 		switch (c) {
 		case 'a':
@@ -288,7 +287,7 @@ main(int argc, char **argv)
 	if (VSL_OpenLog(vd))
 		exit (1);
 
-	if (w_opt != NULL) 
+	if (w_opt != NULL)
 		do_write(vd, w_opt, a_flag);
 
 	if (o_flag)
@@ -300,7 +299,7 @@ main(int argc, char **argv)
 			fflush(stdout);
 		else if (i < 0)
 			break;
-	} 
+	}
 
 	return (0);
 }
diff --git a/varnish-cache/bin/varnishncsa/varnishncsa.c b/varnish-cache/bin/varnishncsa/varnishncsa.c
index 3b0d929b..dd3a89c0 100644
--- a/varnish-cache/bin/varnishncsa/varnishncsa.c
+++ b/varnish-cache/bin/varnishncsa/varnishncsa.c
@@ -3,6 +3,9 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Anders Berg <andersb@vgnett.no>
+ * Author: Poul-Henning Kamp <phk@phk.freebsd.dk>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,9 +27,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Initial implementation by Anders Berg <andersb@vgnett.no> and
- * Poul-Henning Kamp <phk@phk.freebsd.dk>
- *
  * $Id$
  *
  * Program that will get data from the shared memory log. When it has the data
@@ -35,7 +35,7 @@
  * in NCSA extended/combined access log format.
  *
  *	"%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
- * 
+ *
  * TODO:	- Log in any format one wants
  *		- Maybe rotate/compress log
  */
@@ -124,7 +124,7 @@ extended_log_format(void *priv, unsigned tag, unsigned fd, unsigned len, unsigne
 			lp->bogus_req = 1;
 		}
 		break;
-	
+
 	case SLT_RxURL:
 		vsb_cat(lp->sb, " ");
 		vsb_bcat(lp->sb, ptr, len);
@@ -141,9 +141,9 @@ extended_log_format(void *priv, unsigned tag, unsigned fd, unsigned len, unsigne
 
 	case SLT_RxHeader:
 		if (ispfx(ptr, len, "user-agent:"))
-                        lp->df_U = strdup(ptr + 12);
-                else if (ispfx(ptr, len, "referer:"))
-                        lp->df_R = strdup(ptr + 9);
+			lp->df_U = strdup(ptr + 12);
+		else if (ispfx(ptr, len, "referer:"))
+			lp->df_R = strdup(ptr + 9);
 		break;
 
 	case SLT_Length:
@@ -202,7 +202,7 @@ main(int argc, char **argv)
 	int append = 0;
 
 	vd = VSL_New();
-	
+
 	while ((c = getopt(argc, argv, VSL_ARGS "aVw:")) != -1) {
 		i = VSL_Arg(vd, c, optarg);
 		if (i < 0)
diff --git a/varnish-cache/bin/varnishstat/varnishstat.c b/varnish-cache/bin/varnishstat/varnishstat.c
index 0fbeb0f8..93374d34 100644
--- a/varnish-cache/bin/varnishstat/varnishstat.c
+++ b/varnish-cache/bin/varnishstat/varnishstat.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Log tailer for Varnish
diff --git a/varnish-cache/bin/varnishtop/varnishtop.c b/varnish-cache/bin/varnishtop/varnishtop.c
index e68579e6..46e49820 100644
--- a/varnish-cache/bin/varnishtop/varnishtop.c
+++ b/varnish-cache/bin/varnishtop/varnishtop.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Log tailer for Varnish
@@ -118,7 +117,7 @@ main(int argc, char **argv)
 
 
 	vd = VSL_New();
-	
+
 	while ((c = getopt(argc, argv, VSL_ARGS "1fV")) != -1) {
 		i = VSL_Arg(vd, c, optarg);
 		if (i < 0)
@@ -185,7 +184,7 @@ main(int argc, char **argv)
 			tp->count = 1.0;
 			tp->clen = q - p;
 			TAILQ_INSERT_TAIL(&top_head, tp, list);
-		} 
+		}
 		memcpy(tp->rec, p, 4 + p[1]);
 		while (1) {
 			tp2 = TAILQ_PREV(tp, tophead, list);
diff --git a/varnish-cache/include/binary_heap.h b/varnish-cache/include/binary_heap.h
index 4bb0dd7d..4e58c107 100644
--- a/varnish-cache/include/binary_heap.h
+++ b/varnish-cache/include/binary_heap.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Binary Heap API (see: http://en.wikipedia.org/wiki/Binary_heap)
@@ -41,7 +40,7 @@ struct binheap;
 typedef int binheap_cmp_t(void *priv, void *a, void *b);
 	/*
 	 * Comparison function.
- 	 * Should return true if item 'a' should be closer to the root
+	 * Should return true if item 'a' should be closer to the root
 	 * than item 'b'
 	 */
 
@@ -57,7 +56,7 @@ struct binheap *binheap_new(void *priv, binheap_cmp_t, binheap_update_t);
 	/*
 	 * Create Binary tree
 	 * 'priv' is passed to cmp and update functions.
- 	 */
+	 */
 
 void binheap_insert(struct binheap *, void *);
 	/*
diff --git a/varnish-cache/include/cli.h b/varnish-cache/include/cli.h
index 497c083f..f7d01320 100644
--- a/varnish-cache/include/cli.h
+++ b/varnish-cache/include/cli.h
@@ -26,17 +26,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Public definition of the CLI protocol, part of the published Varnish-API.
  *
- * The overall structure of the protocol is a command-line like 
+ * The overall structure of the protocol is a command-line like
  * "command+arguments" request and a IETF style "number + string" response.
  *
  * Arguments can contain arbitrary sequences of bytes which are encoded
  * in back-slash notation in double-quoted, if necessary.
- *
  */
 
 /*
@@ -115,13 +113,13 @@
 	"param.set",							\
 	"param.set <param> <value>",					\
 	"\tSet parameter value.",					\
-	2,2 
+	2,2
 
 #define CLI_SERVER_FREEZE						\
 	"server.freeze",						\
 	"server.freeze",						\
 	"\tStop the clock, freeze object store.",			\
-	0, 0 
+	0, 0
 
 #define CLI_SERVER_THAW							\
 	"thaw",								\
diff --git a/varnish-cache/include/cli_common.h b/varnish-cache/include/cli_common.h
index b7d41591..0c4b393a 100644
--- a/varnish-cache/include/cli_common.h
+++ b/varnish-cache/include/cli_common.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/include/cli_priv.h b/varnish-cache/include/cli_priv.h
index 4dc0d2d5..556dcf97 100644
--- a/varnish-cache/include/cli_priv.h
+++ b/varnish-cache/include/cli_priv.h
@@ -26,13 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Varnish process internal CLI stuff.
  *
  * XXX: at a latter date we may want to move some to cli.h/libvarnishapi
- *
  */
 
 #define CLI_PRIV_H
diff --git a/varnish-cache/include/compat/asprintf.h b/varnish-cache/include/compat/asprintf.h
index dee9df1a..16f31d46 100644
--- a/varnish-cache/include/compat/asprintf.h
+++ b/varnish-cache/include/compat/asprintf.h
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/include/compat/setproctitle.h b/varnish-cache/include/compat/setproctitle.h
index 4a88cd64..41b7fc9d 100644
--- a/varnish-cache/include/compat/setproctitle.h
+++ b/varnish-cache/include/compat/setproctitle.h
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/include/compat/srandomdev.h b/varnish-cache/include/compat/srandomdev.h
index 7e3bae02..feed4c80 100644
--- a/varnish-cache/include/compat/srandomdev.h
+++ b/varnish-cache/include/compat/srandomdev.h
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/include/compat/strlcat.h b/varnish-cache/include/compat/strlcat.h
index 16354c5a..21fc16b6 100644
--- a/varnish-cache/include/compat/strlcat.h
+++ b/varnish-cache/include/compat/strlcat.h
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/include/compat/strlcpy.h b/varnish-cache/include/compat/strlcpy.h
index 91df87c4..46dc5b4d 100644
--- a/varnish-cache/include/compat/strlcpy.h
+++ b/varnish-cache/include/compat/strlcpy.h
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/include/compat/strndup.h b/varnish-cache/include/compat/strndup.h
index 4a2074ba..616e501b 100644
--- a/varnish-cache/include/compat/strndup.h
+++ b/varnish-cache/include/compat/strndup.h
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/include/compat/vasprintf.h b/varnish-cache/include/compat/vasprintf.h
index 3ad92275..f4be920c 100644
--- a/varnish-cache/include/compat/vasprintf.h
+++ b/varnish-cache/include/compat/vasprintf.h
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/include/http_headers.h b/varnish-cache/include/http_headers.h
index 7076b3b8..c1e2104a 100644
--- a/varnish-cache/include/http_headers.h
+++ b/varnish-cache/include/http_headers.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * a	Http header name
@@ -39,7 +38,7 @@
  *
  * see [RFC2616 13.5.1 End-to-end and Hop-by-hop Headers]
  *
- *    a                         b                       c  d  e  f  g 
+ *    a                         b                       c  d  e  f  g
  *--------------------------------------------------------------------
  */
 
diff --git a/varnish-cache/include/libvarnish.h b/varnish-cache/include/libvarnish.h
index b294bddd..a9031a06 100644
--- a/varnish-cache/include/libvarnish.h
+++ b/varnish-cache/include/libvarnish.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/include/libvcl.h b/varnish-cache/include/libvcl.h
index 22baa59e..27515b05 100644
--- a/varnish-cache/include/libvcl.h
+++ b/varnish-cache/include/libvcl.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/include/shmlog.h b/varnish-cache/include/shmlog.h
index 535d5754..080cd825 100644
--- a/varnish-cache/include/shmlog.h
+++ b/varnish-cache/include/shmlog.h
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Poul-Henning Kamp <phk@phk.freebsd.dk>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,13 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Define the layout of the shared memory log segment.
  *
  * NB: THIS IS NOT A PUBLIC API TO VARNISH!
- *
  */
 
 #define SHMLOG_FILENAME		"/tmp/_.vsl"
@@ -49,7 +49,7 @@ struct shmloghead {
 
 	/*
 	 * Byte offset into the file where the fifolog starts
- 	 * This allows the header to expand later.
+	 * This allows the header to expand later.
 	 */
 	unsigned		start;
 
diff --git a/varnish-cache/include/shmlog_tags.h b/varnish-cache/include/shmlog_tags.h
index 1f30f2d7..18086cf5 100644
--- a/varnish-cache/include/shmlog_tags.h
+++ b/varnish-cache/include/shmlog_tags.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Define the tags in the shared memory in a reusable format.
diff --git a/varnish-cache/include/stat_field.h b/varnish-cache/include/stat_field.h
index f9f899f8..571e6e01 100644
--- a/varnish-cache/include/stat_field.h
+++ b/varnish-cache/include/stat_field.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * $Id$
- *
  */
 
 MAC_STAT(client_conn,		uint64_t, "u", "Client connections accepted")
diff --git a/varnish-cache/include/stats.h b/varnish-cache/include/stats.h
index 4ac1326c..f736b580 100644
--- a/varnish-cache/include/stats.h
+++ b/varnish-cache/include/stats.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * $Id$
- *
  */
 
 #include <stdint.h>
diff --git a/varnish-cache/include/varnishapi.h b/varnish-cache/include/varnishapi.h
index 26742d32..d9da6224 100644
--- a/varnish-cache/include/varnishapi.h
+++ b/varnish-cache/include/varnishapi.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/include/vcl.h b/varnish-cache/include/vcl.h
index fa281c26..2b8f8b5c 100644
--- a/varnish-cache/include/vcl.h
+++ b/varnish-cache/include/vcl.h
@@ -16,16 +16,16 @@ struct VCL_conf {
 	unsigned        magic;
 #define VCL_CONF_MAGIC  0x7406c509      /* from /dev/random */
 
-        struct backend  **backend;
-        unsigned        nbackend;
-        struct vrt_ref  *ref;
-        unsigned        nref;
-        unsigned        busy;
+	struct backend  **backend;
+	unsigned        nbackend;
+	struct vrt_ref  *ref;
+	unsigned        nref;
+	unsigned        busy;
 
-        void            *priv;
+	void            *priv;
 
-        vcl_init_f      *init_func;
-        vcl_fini_f      *fini_func;
+	vcl_init_f      *init_func;
+	vcl_fini_f      *fini_func;
 
 	vcl_func_f	*recv_func;
 	vcl_func_f	*miss_func;
diff --git a/varnish-cache/include/vrt.h b/varnish-cache/include/vrt.h
index 9bf5ae9b..330b697b 100644
--- a/varnish-cache/include/vrt.h
+++ b/varnish-cache/include/vrt.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Runtime support for compiled VCL programs.
diff --git a/varnish-cache/include/vsb.h b/varnish-cache/include/vsb.h
index 3632fdb0..a8c09516 100644
--- a/varnish-cache/include/vsb.h
+++ b/varnish-cache/include/vsb.h
@@ -25,7 +25,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *
  * $Id$
  * $FreeBSD: src/sys/sys/vsb.h,v 1.14 2004/07/09 11:35:30 des Exp $
  */
diff --git a/varnish-cache/lib/libcompat/asprintf.c b/varnish-cache/lib/libcompat/asprintf.c
index 1824e2b6..a14fadba 100644
--- a/varnish-cache/lib/libcompat/asprintf.c
+++ b/varnish-cache/lib/libcompat/asprintf.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,8 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Initial implementation by Dag-Erling Smørgrav <des@des.no>
- *
  * $Id$
  *
  */
diff --git a/varnish-cache/lib/libcompat/setproctitle.c b/varnish-cache/lib/libcompat/setproctitle.c
index 54717ba7..7d17f495 100644
--- a/varnish-cache/lib/libcompat/setproctitle.c
+++ b/varnish-cache/lib/libcompat/setproctitle.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,8 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Initial implementation by Dag-Erling Smørgrav <des@des.no>
- *
  * $Id$
  */
 
diff --git a/varnish-cache/lib/libcompat/srandomdev.c b/varnish-cache/lib/libcompat/srandomdev.c
index ccbf222c..89a151d6 100644
--- a/varnish-cache/lib/libcompat/srandomdev.c
+++ b/varnish-cache/lib/libcompat/srandomdev.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,8 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Initial implementation by Dag-Erling Smørgrav <des@des.no>
- *
  * $Id$
  */
 
diff --git a/varnish-cache/lib/libcompat/strndup.c b/varnish-cache/lib/libcompat/strndup.c
index cc713533..bb7332aa 100644
--- a/varnish-cache/lib/libcompat/strndup.c
+++ b/varnish-cache/lib/libcompat/strndup.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  */
diff --git a/varnish-cache/lib/libcompat/vasprintf.c b/varnish-cache/lib/libcompat/vasprintf.c
index fdab1590..80c9410f 100644
--- a/varnish-cache/lib/libcompat/vasprintf.c
+++ b/varnish-cache/lib/libcompat/vasprintf.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,8 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Initial implementation by Dag-Erling Smørgrav <des@des.no>
- *
  * $Id$
  *
  */
diff --git a/varnish-cache/lib/libvarnish/argv.c b/varnish-cache/lib/libvarnish/argv.c
index a2d96fcb..f8110d0a 100644
--- a/varnish-cache/lib/libvarnish/argv.c
+++ b/varnish-cache/lib/libvarnish/argv.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * const char **ParseArgv(const char *s, int comment)
@@ -194,7 +193,7 @@ void
 FreeArgv(char **argv)
 {
 	int i;
-	
+
 	for (i = 1; argv[i] != NULL; i++)
 		free(argv[i]);
 	free(argv);
@@ -234,7 +233,7 @@ main(int argc, char **argv)
 	(void)argc;
 	(void)argv;
 
-        register_printf_render_std("V");
+	register_printf_render_std("V");
 
 	while (fgets(buf, sizeof buf, stdin))
 		Test(buf);
diff --git a/varnish-cache/lib/libvarnish/assert.c b/varnish-cache/lib/libvarnish/assert.c
index 5c41e26a..1eb14d8a 100644
--- a/varnish-cache/lib/libvarnish/assert.c
+++ b/varnish-cache/lib/libvarnish/assert.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/lib/libvarnish/binary_heap.c b/varnish-cache/lib/libvarnish/binary_heap.c
index 8e056950..2a8a7447 100644
--- a/varnish-cache/lib/libvarnish/binary_heap.c
+++ b/varnish-cache/lib/libvarnish/binary_heap.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Implementation of a binary heap API
@@ -208,7 +207,7 @@ binheap_delete(struct binheap *bh, unsigned idx)
 	assert(idx > 0);
 	assert(bh->array[idx] != NULL);
 	bh->update(bh->priv, bh->array[idx], 0);
-	if (idx == --bh->next) { 
+	if (idx == --bh->next) {
 		bh->array[bh->next] = NULL;
 		return;
 	}
diff --git a/varnish-cache/lib/libvarnish/cli.c b/varnish-cache/lib/libvarnish/cli.c
index d13c15bb..763f9a08 100644
--- a/varnish-cache/lib/libvarnish/cli.c
+++ b/varnish-cache/lib/libvarnish/cli.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Stuff for handling the CLI protocol
diff --git a/varnish-cache/lib/libvarnish/cli_common.c b/varnish-cache/lib/libvarnish/cli_common.c
index 2a06db50..cd67eec5 100644
--- a/varnish-cache/lib/libvarnish/cli_common.c
+++ b/varnish-cache/lib/libvarnish/cli_common.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/lib/libvarnish/crc32.c b/varnish-cache/lib/libvarnish/crc32.c
index 2a018e98..8c7f9f19 100644
--- a/varnish-cache/lib/libvarnish/crc32.c
+++ b/varnish-cache/lib/libvarnish/crc32.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * This CRC32 implementation is in the public domain.
diff --git a/varnish-cache/lib/libvarnish/time.c b/varnish-cache/lib/libvarnish/time.c
index bfc0dc8c..c4ca7abe 100644
--- a/varnish-cache/lib/libvarnish/time.c
+++ b/varnish-cache/lib/libvarnish/time.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Semi-trivial functions to handle HTTP header timestamps according to
diff --git a/varnish-cache/lib/libvarnish/version.c b/varnish-cache/lib/libvarnish/version.c
index 937423c6..b32fb52a 100644
--- a/varnish-cache/lib/libvarnish/version.c
+++ b/varnish-cache/lib/libvarnish/version.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2006 Linpro AS
  * All rights reserved.
  *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Display a standardized version message.
diff --git a/varnish-cache/lib/libvarnishapi/shmlog.c b/varnish-cache/lib/libvarnishapi/shmlog.c
index d78d439f..98044771 100644
--- a/varnish-cache/lib/libvarnishapi/shmlog.c
+++ b/varnish-cache/lib/libvarnishapi/shmlog.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
@@ -276,7 +275,7 @@ VSL_NextLog(struct VSL_data *vd, unsigned char **pp)
 			*pp = p;
 			return (1);
 		}
-		if (vd->map[p[0]] & M_SUPPRESS) 
+		if (vd->map[p[0]] & M_SUPPRESS)
 			continue;
 		if (vd->b_opt && !(vd->map[u] & M_BACKEND))
 			continue;
diff --git a/varnish-cache/lib/libvcl/vcc_acl.c b/varnish-cache/lib/libvcl/vcc_acl.c
index e24d3dd1..2af3a1ae 100644
--- a/varnish-cache/lib/libvcl/vcc_acl.c
+++ b/varnish-cache/lib/libvcl/vcc_acl.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
@@ -104,12 +103,12 @@ vcc_Acl(struct tokenlist *tl)
 		if (tl->t->tok == '(') {
 			para = 1;
 			vcc_NextToken(tl);
-		} 
+		}
 
 		if (tl->t->tok == '!') {
 			not = 1;
 			vcc_NextToken(tl);
-		} 
+		}
 
 		ExpectErr(tl, CSTR);
 		/* XXX: try to look it up, warn if failure */
@@ -119,7 +118,7 @@ vcc_Acl(struct tokenlist *tl)
 			vcc_NextToken(tl);
 			ExpectErr(tl, CNUM);
 			mask = UintVal(tl);
-		} 
+		}
 		Fc(tl, 1, "{ %u, %u, %u, ", not, mask, para);
 		EncString(tl->fc, t);
 		Fc(tl, 0, ", \"");
diff --git a/varnish-cache/lib/libvcl/vcc_compile.c b/varnish-cache/lib/libvcl/vcc_compile.c
index a0fd9a10..d5d14f83 100644
--- a/varnish-cache/lib/libvcl/vcc_compile.c
+++ b/varnish-cache/lib/libvcl/vcc_compile.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
@@ -36,7 +35,7 @@
  *
  * XXX:
  *	Better error messages, throughout.
- *	>It also accured to me that we could link the errors to the error 
+ *	>It also accured to me that we could link the errors to the error
  *	>documentation.
  *	>
  *	>Unreferenced  function 'request_policy', first mention is
@@ -53,7 +52,7 @@
  *	>         ------------#############------------
  *	>Read more about this type of error:
  *	>http://varnish/doc/error.html#Unknown%20variable
- * 
+ *
  * XXX:
  *	Create proper tmp filenames for .h, .c and .o
  *
@@ -115,7 +114,7 @@ const char *vcc_default_vcl_b, *vcc_default_vcl_e;
 	Fc(tl, 1, "VRT_count(sp, %u)%s\n", ++tl->cnt, sep);	\
 	tl->t->cnt = tl->cnt; 				\
 } while (0)
-	
+
 /*--------------------------------------------------------------------
  * Printf output to the two vsbs, possibly indented
  */
@@ -383,7 +382,7 @@ DoubleVal(struct tokenlist *tl)
 		d += *p - '0';
 	}
 	vcc_NextToken(tl);
-	if (tl->t->tok != '.') 
+	if (tl->t->tok != '.')
 		return (d);
 	vcc_NextToken(tl);
 	if (tl->t->tok != CNUM)
@@ -630,7 +629,7 @@ Cond_2(struct tokenlist *tl)
 		case STRING:	L(tl, Cond_String(vp, tl)); break;
 		case TIME:	L(tl, Cond_Int(vp, tl)); break;
 		case BACKEND:	L(tl, Cond_Backend(vp, tl)); break;
-		default:	
+		default:
 			vsb_printf(tl->sb,
 			    "Variable '%s'"
 			    " has no conditions that can be checked\n",
@@ -806,7 +805,7 @@ Action(struct tokenlist *tl)
 		case RATE:
 		case TIME:
 		case FLOAT:
-			if (tl->t->tok != '=') 
+			if (tl->t->tok != '=')
 				Fc(tl, 0, "%s %c ", vp->rname, *tl->t->b);
 			a = tl->t->tok;
 			vcc_NextToken(tl);
@@ -818,7 +817,7 @@ Action(struct tokenlist *tl)
 				SizeVal(tl);
 			else if (vp->fmt == RATE)
 				RateVal(tl);
-			else 
+			else
 				Fc(tl, 0, "%g", DoubleVal(tl));
 			Fc(tl, 0, ");\n");
 			break;
@@ -923,7 +922,7 @@ CheckHostPort(const char *host, const char *port)
 	hint.ai_family = PF_UNSPEC;
 	hint.ai_socktype = SOCK_STREAM;
 	error = getaddrinfo(host, port, &hint, &res);
-	if (error) 
+	if (error)
 		return (gai_strerror(error));
 	freeaddrinfo(res);
 	return (NULL);
@@ -1016,7 +1015,7 @@ Backend(struct tokenlist *tl)
 			return;
 		}
 	}
-	
+
 	vcc_NextToken(tl);
 	Fc(tl, 1, "}\n");
 	Fc(tl, 0, "\n");
@@ -1100,7 +1099,7 @@ AddProc(struct tokenlist *tl, struct token *t, int def)
 	struct proc *p;
 
 	TAILQ_FOREACH(p, &tl->procs, list) {
-		if (!vcc_Teq(p->name, t)) 
+		if (!vcc_Teq(p->name, t))
 			continue;
 		if (def)
 			p->name = t;
@@ -1154,7 +1153,7 @@ Consist_Decend(struct tokenlist *tl, struct proc *p, unsigned returns)
 		if (u & VCL_RET_##b) { \
 			vsb_printf(tl->sb, "Illegal return for method\n"); \
 			vcc_ErrWhere(tl, p->returnt[d]); \
-		} 
+		}
 #include "vcl_returns.h"
 #undef VCL_RET_MAC
 		vsb_printf(tl->sb, "In function\n");
@@ -1189,7 +1188,7 @@ Consistency(struct tokenlist *tl)
 			if (vcc_IdIs(p->name, m->name))
 				break;
 		}
-		if (m->name == NULL) 
+		if (m->name == NULL)
 			continue;
 		if (Consist_Decend(tl, p, m->returns)) {
 			vsb_printf(tl->sb,
@@ -1251,7 +1250,7 @@ CheckRefs(struct tokenlist *tl)
 			    type, PF(r->name));
 			vcc_ErrWhere(tl, r->name);
 			continue;
-		} 
+		}
 
 		vsb_printf(tl->sb, "Unused %s %.*s, defined:\n",
 		    type, PF(r->name));
@@ -1268,7 +1267,7 @@ LocTable(struct tokenlist *tl)
 	struct token *t;
 	unsigned fil, lin, pos;
 	const char *p;
-	
+
 	Fh(tl, 0, "#define VGC_NREFS %u\n", tl->cnt + 1);
 	Fh(tl, 0, "static struct vrt_ref VGC_ref[VGC_NREFS];\n");
 	Fc(tl, 0, "static struct vrt_ref VGC_ref[VGC_NREFS] = {\n");
@@ -1294,7 +1293,7 @@ LocTable(struct tokenlist *tl)
 				pos += 8;
 			} else
 				pos++;
-		
+
 		}
 		Fc(tl, 0, "  [%3u] = { %d, %4u, %3u, 0, \"%.*s\" },\n",
 		    t->cnt, fil, lin, pos + 1, PF(t));
@@ -1422,7 +1421,7 @@ VCC_Compile(struct vsb *sb, const char *b, const char *e)
 	assert(of != NULL);
 	mktemp(of);
 
-	sprintf(buf, 
+	sprintf(buf,
 	    "tee /tmp/_.c |"
 	    "cc -fpic -shared -Wl,-x -o %s -x c - ", of);
 
@@ -1484,7 +1483,7 @@ VCC_CompileFile(struct vsb *sb, const char *fn)
 	assert(0 == fstat(fd, &st));
 	f = malloc(st.st_size + 1);
 	assert(f != NULL);
-	i = read(fd, f, st.st_size); 
+	i = read(fd, f, st.st_size);
 	assert(i == st.st_size);
 	f[i] = '\0';
 	r = VCC_Compile(sb, f, NULL);
@@ -1502,7 +1501,7 @@ VCC_InitCompile(const char *default_vcl)
 	vcc_default_vcl_b = default_vcl;
 	vcc_default_vcl_e = strchr(default_vcl, '\0');
 	assert(vcc_default_vcl_e != NULL);
-	
+
 	vcl_init_tnames();
 	for (v = vcc_vars; v->name != NULL; v++)
 		v->len = strlen(v->name);
diff --git a/varnish-cache/lib/libvcl/vcc_compile.h b/varnish-cache/lib/libvcl/vcc_compile.h
index b2fa8f06..8de3acaf 100644
--- a/varnish-cache/lib/libvcl/vcc_compile.h
+++ b/varnish-cache/lib/libvcl/vcc_compile.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
diff --git a/varnish-cache/lib/libvcl/vcc_fixed_token.c b/varnish-cache/lib/libvcl/vcc_fixed_token.c
index 4e569ef2..58a34bed 100644
--- a/varnish-cache/lib/libvcl/vcc_fixed_token.c
+++ b/varnish-cache/lib/libvcl/vcc_fixed_token.c
@@ -165,78 +165,78 @@ vcl_fixed_token(const char *p, const char **q)
 		}
 		return (0);
 	case 'b':
-		if (p[0] == 'b' && p[1] == 'a' && p[2] == 'c' && 
-		    p[3] == 'k' && p[4] == 'e' && p[5] == 'n' && 
+		if (p[0] == 'b' && p[1] == 'a' && p[2] == 'c' &&
+		    p[3] == 'k' && p[4] == 'e' && p[5] == 'n' &&
 		    p[6] == 'd' && !isvar(p[7])) {
 			*q = p + 7;
 			return (T_BACKEND);
 		}
 		return (0);
 	case 'c':
-		if (p[0] == 'c' && p[1] == 'a' && p[2] == 'l' && 
+		if (p[0] == 'c' && p[1] == 'a' && p[2] == 'l' &&
 		    p[3] == 'l' && !isvar(p[4])) {
 			*q = p + 4;
 			return (T_CALL);
 		}
 		return (0);
 	case 'd':
-		if (p[0] == 'd' && p[1] == 'i' && p[2] == 's' && 
-		    p[3] == 'c' && p[4] == 'a' && p[5] == 'r' && 
+		if (p[0] == 'd' && p[1] == 'i' && p[2] == 's' &&
+		    p[3] == 'c' && p[4] == 'a' && p[5] == 'r' &&
 		    p[6] == 'd' && !isvar(p[7])) {
 			*q = p + 7;
 			return (T_DISCARD);
 		}
-		if (p[0] == 'd' && p[1] == 'e' && p[2] == 'l' && 
-		    p[3] == 'i' && p[4] == 'v' && p[5] == 'e' && 
+		if (p[0] == 'd' && p[1] == 'e' && p[2] == 'l' &&
+		    p[3] == 'i' && p[4] == 'v' && p[5] == 'e' &&
 		    p[6] == 'r' && !isvar(p[7])) {
 			*q = p + 7;
 			return (T_DELIVER);
 		}
 		return (0);
 	case 'e':
-		if (p[0] == 'e' && p[1] == 'r' && p[2] == 'r' && 
+		if (p[0] == 'e' && p[1] == 'r' && p[2] == 'r' &&
 		    p[3] == 'o' && p[4] == 'r' && !isvar(p[5])) {
 			*q = p + 5;
 			return (T_ERROR);
 		}
-		if (p[0] == 'e' && p[1] == 'l' && p[2] == 's' && 
+		if (p[0] == 'e' && p[1] == 'l' && p[2] == 's' &&
 		    p[3] == 'i' && p[4] == 'f' && !isvar(p[5])) {
 			*q = p + 5;
 			return (T_ELSIF);
 		}
-		if (p[0] == 'e' && p[1] == 'l' && p[2] == 's' && 
+		if (p[0] == 'e' && p[1] == 'l' && p[2] == 's' &&
 		    p[3] == 'e' && p[4] == 'i' && p[5] == 'f'
 		     && !isvar(p[6])) {
 			*q = p + 6;
 			return (T_ELSEIF);
 		}
-		if (p[0] == 'e' && p[1] == 'l' && p[2] == 's' && 
+		if (p[0] == 'e' && p[1] == 'l' && p[2] == 's' &&
 		    p[3] == 'e' && !isvar(p[4])) {
 			*q = p + 4;
 			return (T_ELSE);
 		}
 		return (0);
 	case 'f':
-		if (p[0] == 'f' && p[1] == 'u' && p[2] == 'n' && 
+		if (p[0] == 'f' && p[1] == 'u' && p[2] == 'n' &&
 		    p[3] == 'c' && !isvar(p[4])) {
 			*q = p + 4;
 			return (T_FUNC);
 		}
-		if (p[0] == 'f' && p[1] == 'e' && p[2] == 't' && 
+		if (p[0] == 'f' && p[1] == 'e' && p[2] == 't' &&
 		    p[3] == 'c' && p[4] == 'h' && !isvar(p[5])) {
 			*q = p + 5;
 			return (T_FETCH);
 		}
 		return (0);
 	case 'i':
-		if (p[0] == 'i' && p[1] == 'n' && p[2] == 's' && 
-		    p[3] == 'e' && p[4] == 'r' && p[5] == 't' && 
-		    p[6] == '_' && p[7] == 'p' && p[8] == 'a' && 
+		if (p[0] == 'i' && p[1] == 'n' && p[2] == 's' &&
+		    p[3] == 'e' && p[4] == 'r' && p[5] == 't' &&
+		    p[6] == '_' && p[7] == 'p' && p[8] == 'a' &&
 		    p[9] == 's' && p[10] == 's' && !isvar(p[11])) {
 			*q = p + 11;
 			return (T_INSERT_PASS);
 		}
-		if (p[0] == 'i' && p[1] == 'n' && p[2] == 's' && 
+		if (p[0] == 'i' && p[1] == 'n' && p[2] == 's' &&
 		    p[3] == 'e' && p[4] == 'r' && p[5] == 't'
 		     && !isvar(p[6])) {
 			*q = p + 6;
@@ -248,7 +248,7 @@ vcl_fixed_token(const char *p, const char **q)
 		}
 		return (0);
 	case 'l':
-		if (p[0] == 'l' && p[1] == 'o' && p[2] == 'o' && 
+		if (p[0] == 'l' && p[1] == 'o' && p[2] == 'o' &&
 		    p[3] == 'k' && p[4] == 'u' && p[5] == 'p'
 		     && !isvar(p[6])) {
 			*q = p + 6;
@@ -256,51 +256,51 @@ vcl_fixed_token(const char *p, const char **q)
 		}
 		return (0);
 	case 'n':
-		if (p[0] == 'n' && p[1] == 'o' && p[2] == '_' && 
-		    p[3] == 'n' && p[4] == 'e' && p[5] == 'w' && 
-		    p[6] == '_' && p[7] == 'c' && p[8] == 'a' && 
+		if (p[0] == 'n' && p[1] == 'o' && p[2] == '_' &&
+		    p[3] == 'n' && p[4] == 'e' && p[5] == 'w' &&
+		    p[6] == '_' && p[7] == 'c' && p[8] == 'a' &&
 		    p[9] == 'c' && p[10] == 'h' && p[11] == 'e'
 		     && !isvar(p[12])) {
 			*q = p + 12;
 			return (T_NO_NEW_CACHE);
 		}
-		if (p[0] == 'n' && p[1] == 'o' && p[2] == '_' && 
-		    p[3] == 'c' && p[4] == 'a' && p[5] == 'c' && 
+		if (p[0] == 'n' && p[1] == 'o' && p[2] == '_' &&
+		    p[3] == 'c' && p[4] == 'a' && p[5] == 'c' &&
 		    p[6] == 'h' && p[7] == 'e' && !isvar(p[8])) {
 			*q = p + 8;
 			return (T_NO_CACHE);
 		}
 		return (0);
 	case 'p':
-		if (p[0] == 'p' && p[1] == 'r' && p[2] == 'o' && 
+		if (p[0] == 'p' && p[1] == 'r' && p[2] == 'o' &&
 		    p[3] == 'c' && !isvar(p[4])) {
 			*q = p + 4;
 			return (T_PROC);
 		}
-		if (p[0] == 'p' && p[1] == 'i' && p[2] == 'p' && 
+		if (p[0] == 'p' && p[1] == 'i' && p[2] == 'p' &&
 		    p[3] == 'e' && !isvar(p[4])) {
 			*q = p + 4;
 			return (T_PIPE);
 		}
-		if (p[0] == 'p' && p[1] == 'a' && p[2] == 's' && 
+		if (p[0] == 'p' && p[1] == 'a' && p[2] == 's' &&
 		    p[3] == 's' && !isvar(p[4])) {
 			*q = p + 4;
 			return (T_PASS);
 		}
 		return (0);
 	case 'r':
-		if (p[0] == 'r' && p[1] == 'e' && p[2] == 'w' && 
-		    p[3] == 'r' && p[4] == 'i' && p[5] == 't' && 
+		if (p[0] == 'r' && p[1] == 'e' && p[2] == 'w' &&
+		    p[3] == 'r' && p[4] == 'i' && p[5] == 't' &&
 		    p[6] == 'e' && !isvar(p[7])) {
 			*q = p + 7;
 			return (T_REWRITE);
 		}
 		return (0);
 	case 's':
-		if (p[0] == 's' && p[1] == 'w' && p[2] == 'i' && 
-		    p[3] == 't' && p[4] == 'c' && p[5] == 'h' && 
-		    p[6] == '_' && p[7] == 'c' && p[8] == 'o' && 
-		    p[9] == 'n' && p[10] == 'f' && p[11] == 'i' && 
+		if (p[0] == 's' && p[1] == 'w' && p[2] == 'i' &&
+		    p[3] == 't' && p[4] == 'c' && p[5] == 'h' &&
+		    p[6] == '_' && p[7] == 'c' && p[8] == 'o' &&
+		    p[9] == 'n' && p[10] == 'f' && p[11] == 'i' &&
 		    p[12] == 'g' && !isvar(p[13])) {
 			*q = p + 13;
 			return (T_SWITCH_CONFIG);
diff --git a/varnish-cache/lib/libvcl/vcc_obj.c b/varnish-cache/lib/libvcl/vcc_obj.c
index 6b12473d..f6aa5d36 100644
--- a/varnish-cache/lib/libvcl/vcc_obj.c
+++ b/varnish-cache/lib/libvcl/vcc_obj.c
@@ -69,7 +69,7 @@ struct var vcc_vars[] = {
 	{ NULL }
 };
 
-const char *vrt_obj_h = 
+const char *vrt_obj_h =
 	"/*\n"
 	" * $Id$\n"
 	" *\n"
diff --git a/varnish-cache/lib/libvcl/vcc_priv.h b/varnish-cache/lib/libvcl/vcc_priv.h
index 21882b97..6157c223 100644
--- a/varnish-cache/lib/libvcl/vcc_priv.h
+++ b/varnish-cache/lib/libvcl/vcc_priv.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  *
  * Stuff shared between main.c and fixed_token.c
diff --git a/varnish-cache/lib/libvcl/vcc_token.c b/varnish-cache/lib/libvcl/vcc_token.c
index 2fe7768f..5cbf2957 100644
--- a/varnish-cache/lib/libvcl/vcc_token.c
+++ b/varnish-cache/lib/libvcl/vcc_token.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *
  * $Id$
  */
 
@@ -71,7 +70,7 @@ vcc_ErrWhere(struct tokenlist *tl, struct token *t)
 {
 	unsigned lin, pos, x, y;
 	const char *p, *l, *f, *b, *e;
-	
+
 	lin = 1;
 	pos = 0;
 	if (t->tok == METHOD)