Make sanity check of binheap permanent and fix style accordingly.

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@664 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache_expire.c

@@ -106,6 +106,7 @@ exp_prefetch(void *arg)
 	struct object *o;
 	time_t t;
 	struct sess *sp;
+	struct object *o2;
 
 	(void)arg;
 
@@ -123,12 +124,12 @@ exp_prefetch(void *arg)
 			continue;
 		}
 		binheap_delete(exp_heap, o->heap_idx);
-{
-	struct object *o2;
-	o2 = binheap_root(exp_heap);
-	if (o2 != NULL)
-		assert(o2->ttl >= o->ttl);
-}
+
+		/* Sanity check */
+		o2 = binheap_root(exp_heap);
+		if (o2 != NULL)
+			assert(o2->ttl >= o->ttl);
+
 		AZ(pthread_mutex_unlock(&exp_mtx));
 		VSL(SLT_ExpPick, 0, "%u", o->xid);