[4.1] 3004602 Remove superflous calls to WS_Assert()

Lasse Karstensen lkarsten at varnish-software.com
Tue Jun 14 11:42:09 CEST 2016


commit 3004602c4bd4849ddc30a03743e56520afd9c98e
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Wed Jan 13 19:21:28 2016 +0000

    Remove superflous calls to WS_Assert()
    
    This was already called and has not been any changes since then.

diff --git a/bin/varnishd/cache/cache_ws.c b/bin/varnishd/cache/cache_ws.c
index 19e8a5a..c105119 100644
--- a/bin/varnishd/cache/cache_ws.c
+++ b/bin/varnishd/cache/cache_ws.c
@@ -134,7 +134,6 @@ WS_Alloc(struct ws *ws, unsigned bytes)
 	assert(ws->r == NULL);
 	if (ws->f + bytes > ws->e) {
 		WS_MarkOverflow(ws);
-		WS_Assert(ws);
 		return(NULL);
 	}
 	r = ws->f;
@@ -160,7 +159,6 @@ WS_Copy(struct ws *ws, const void *str, int len)
 	bytes = PRNDUP((unsigned)len);
 	if (ws->f + bytes > ws->e) {
 		WS_MarkOverflow(ws);
-		WS_Assert(ws);
 		return(NULL);
 	}
 	r = ws->f;



More information about the varnish-commit mailing list