From: des <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Thu, 27 Sep 2007 10:08:30 +0000 (+0000)
Subject: Use CHECK_OBJ_ORNULL().
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f89bbe447fca1a89807a7de440e97dc81634d041;p=varnish

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 f2c953e0..f63873db 100644
--- 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));