[4.0] 6111bc3 fight ocpd

Lasse Karstensen lkarsten at varnish-software.com
Mon Sep 22 16:38:24 CEST 2014


commit 6111bc31d353baf6d2330ce613e8a7e73294b653
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Aug 27 19:30:51 2014 +0200

    fight ocpd

diff --git a/bin/varnishd/cache/cache_ws.c b/bin/varnishd/cache/cache_ws.c
index 956fef4..3930c4d 100644
--- a/bin/varnishd/cache/cache_ws.c
+++ b/bin/varnishd/cache/cache_ws.c
@@ -204,8 +204,7 @@ WS_Reserve(struct ws *ws, unsigned bytes)
 	assert(ws->r == NULL);
 
 	b2 = PRNDDN(ws->e - ws->f);
-	if ((bytes != 0) &&
-	    (bytes < b2))
+	if (bytes != 0 && bytes < b2)
 		b2 = PRNDUP(bytes);
 
 	xxxassert(ws->f + b2 <= ws->e);



More information about the varnish-commit mailing list