From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Sun, 23 Sep 2007 12:46:19 +0000 (+0000)
Subject: Use CHECK_OBJ_ORNULL() macro
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10f3f349b7788fccb94cb5bc11aa52a3e2210876;p=varnish

Use CHECK_OBJ_ORNULL() macro


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

diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 22e2a846..15c35e1a 100644
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -186,17 +186,13 @@ wrk_do_one(struct worker *w)
 	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;
 }