r1982 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2007-09-23 14:46:19 +0200 (Sun, 23 Sep 2007)
New Revision: 1982

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


Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c	2007-09-23 12:44:12 UTC (rev 1981)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c	2007-09-23 12:46:19 UTC (rev 1982)
@@ -186,17 +186,13 @@
 	wrq = w->wrq;
 	CHECK_OBJ_NOTNULL(wrq->sess, SESS_MAGIC);
 	wrq->sess->wrk = w;
-	if (w->nobj != NULL)
-		CHECK_OBJ(w->nobj, OBJECT_MAGIC);
-	if (w->nobjhead != NULL)
-		CHECK_OBJ(w->nobjhead, OBJHEAD_MAGIC);
+	CHECK_OBJ_ORNULL(w->nobj, OBJECT_MAGIC);
+	CHECK_OBJ_ORNULL(w->nobjhead, OBJHEAD_MAGIC);
 	w->used = NAN;
 	CNT_Session(wrq->sess);
 	assert(!isnan(w->used));
-	if (w->nobj != NULL)
-		CHECK_OBJ(w->nobj, OBJECT_MAGIC);
-	if (w->nobjhead != NULL)
-		CHECK_OBJ(w->nobjhead, OBJHEAD_MAGIC);
+	CHECK_OBJ_ORNULL(w->nobj, OBJECT_MAGIC);
+	CHECK_OBJ_ORNULL(w->nobjhead, OBJHEAD_MAGIC);
 	w->wrq = NULL;
 }