r2050 - trunk/varnish-cache/bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-09-27 12:08:30 +0200 (Thu, 27 Sep 2007)
New Revision: 2050

Modified:
   trunk/varnish-cache/bin/varnishd/cache_expire.c
Log:
Use CHECK_OBJ_ORNULL().


Modified: trunk/varnish-cache/bin/varnishd/cache_expire.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_expire.c	2007-09-26 19:43:56 UTC (rev 2049)
+++ trunk/varnish-cache/bin/varnishd/cache_expire.c	2007-09-27 10:08:30 UTC (rev 2050)
@@ -181,8 +181,7 @@
 	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));