]> err.no Git - varnish/commitdiff
Make sanity check of binheap permanent and fix style accordingly.
authorphk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Sat, 5 Aug 2006 12:23:44 +0000 (12:23 +0000)
committerphk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Sat, 5 Aug 2006 12:23:44 +0000 (12:23 +0000)
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@664 d4fa192b-c00b-0410-8231-f00ffab90ce4

varnish-cache/bin/varnishd/cache_expire.c

index 3a42da9ff424d9e1471c5c8c6acc27ae87809699..0be95803ec6bdad48c5de78215d729d0273051c2 100644 (file)
@@ -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);