[master] 6610974 Polishing

[Poul-Henning Kamp]

commit 6610974463078569cec5555b404af2eb8f359647
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Oct 17 08:28:38 2013 +0000

    Polishing

diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index a6c802a..193ddb0 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -291,7 +291,7 @@ EXP_NukeOne(struct busyobj *bo, struct lru *lru)
 		/*
 		 * It wont release any space if we cannot release the last
 		 * reference, besides, if somebody else has a reference,
-		 * it's a bad idea to nuke this object anyway. 
+		 * it's a bad idea to nuke this object anyway.
 		 */
 		if (oc->refcnt > 1)
 			continue;
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 5031eab..1e0d7e4 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -91,6 +91,7 @@ mgt_sltm(const char *tag, const char *sdesc, const char *ldesc)
 
 }
 
+/*lint -e{506} constant value boolean */
 static void
 mgt_DumpRstVsl(void)
 {
diff --git a/bin/varnishd/storage/storage_persistent_silo.c b/bin/varnishd/storage/storage_persistent_silo.c
index e57a758..35af470 100644
--- a/bin/varnishd/storage/storage_persistent_silo.c
+++ b/bin/varnishd/storage/storage_persistent_silo.c
@@ -472,7 +472,7 @@ smp_oc_getobj(struct dstat *ds, struct objcore *oc)
 		oc->flags &= ~OC_F_NEEDFIXUP;
 	}
 	Lck_Unlock(&sg->sc->mtx);
-	EXP_Rearm(o, NAN, NAN, NAN, NAN); 	// XXX: Shouldn't be needed
+	EXP_Rearm(o, NAN, NAN, NAN, NAN);	// XXX: Shouldn't be needed
 	return (o);
 }