[4.1] 88cf4e0 Polish

Lasse Karstensen lkarsten at varnish-software.com
Thu Feb 25 15:11:14 CET 2016


commit 88cf4e0d537c0f9405f3faa0ab2af7a30246e22a
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Feb 18 18:41:20 2016 +0100

    Polish

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 52623f9..1800b71 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -535,13 +535,16 @@ vbf_fetch_body_helper(struct busyobj *bo)
  */
 
 #define vbf_vfp_push(bo, vfp, top)					\
-	if (VFP_Push((bo)->vfc, (vfp), (top)) == NULL) {		\
-		assert (WS_Overflowed((bo)->vfc->http->ws));		\
-		(void)VFP_Error((bo)->vfc, "workspace_backend overflow"); \
-		(bo)->htc->doclose = SC_OVERLOAD;			\
-		VDI_Finish((bo)->wrk, bo);				\
-		return (F_STP_ERROR);					\
-	}
+	do {								\
+		if (VFP_Push((bo)->vfc, (vfp), (top)) == NULL) {	\
+			assert (WS_Overflowed((bo)->vfc->http->ws));	\
+			(void)VFP_Error((bo)->vfc,			\
+			    "workspace_backend overflow");		\
+			(bo)->htc->doclose = SC_OVERLOAD;		\
+			VDI_Finish((bo)->wrk, bo);			\
+			return (F_STP_ERROR);				\
+		}							\
+	} while (0)
 
 static enum fetch_step
 vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)



More information about the varnish-commit mailing list