r5563 - trunk/varnish-cache/bin/varnishd

phk at varnish-cache.org phk at varnish-cache.org
Sun Nov 21 00:58:21 CET 2010


Author: phk
Date: 2010-11-21 00:58:20 +0100 (Sun, 21 Nov 2010)
New Revision: 5563

Modified:
   trunk/varnish-cache/bin/varnishd/stevedore.c
Log:
We do not need to set the oc->objhead, assert it has already happened.



Modified: trunk/varnish-cache/bin/varnishd/stevedore.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.c	2010-11-20 23:23:07 UTC (rev 5562)
+++ trunk/varnish-cache/bin/varnishd/stevedore.c	2010-11-20 23:58:20 UTC (rev 5563)
@@ -204,7 +204,8 @@
 		CHECK_OBJ_NOTNULL(sp->objcore, OBJCORE_MAGIC);
 
 		o->objcore = sp->objcore;
-		sp->objcore->objhead = sp->objhead;
+		assert(o->objcore->objhead == sp->objhead);
+
 		sp->objhead = NULL;     /* refcnt follows pointer. */
 		sp->objcore = NULL;     /* refcnt follows pointer. */
 		BAN_NewObj(o);




More information about the varnish-commit mailing list