Use CHECK_OBJ_ORNULL().

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

diff --git a/varnish-cache/bin/varnishd/cache_expire.c b/varnish-cache/bin/varnishd/cache_expire.c
index f2c953e08119b8ce07cf55adf998adbcf2e3d48d..f63873db560a60a46936ace4860411770eaadf10 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_expire.c
+++ b/varnish-cache/bin/varnishd/cache_expire.c
@@ -181,8 +181,7 @@ exp_prefetch(void *arg)
        while (1) {
                LOCK(&exp_mtx);
                o = binheap_root(exp_heap);
-               if (o != NULL)
-                       CHECK_OBJ(o, OBJECT_MAGIC);
+               CHECK_OBJ_ORNULL(o, OBJECT_MAGIC);
                if (o == NULL || o->ttl > t + expearly) {
                        UNLOCK(&exp_mtx);
                        AZ(sleep(1));