Clarify VFP_NULL semantics

d8a627ec · Nils Goroll · 5e34d67f · d8a627ec · d8a627ec
Unverified Commit d8a627ec authored May 29, 2022 by Nils Goroll
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

cache_fetch_proc.c bin/varnishd/cache/cache_fetch_proc.c +1 -0

cache_filter.h bin/varnishd/cache/cache_filter.h +1 -1

No files found.
--- a/bin/varnishd/cache/cache_fetch_proc.c
+++ b/bin/varnishd/cache/cache_fetch_proc.c
@@ -201,6 +201,7 @@ VFP_Suck(struct vfp_ctx *vc, void *p, ssize_t *lp)
 		vp = vfe->closed;
 	}
 	vc->vfp_nxt = vfe;
+	assert(vp != VFP_NULL);
 	return (vp);
 }


--- a/bin/varnishd/cache/cache_filter.h
+++ b/bin/varnishd/cache/cache_filter.h
@@ -40,7 +40,7 @@ enum vfp_status {
 	VFP_ERROR = -1,
 	VFP_OK = 0,
 	VFP_END = 1,
-	VFP_NULL = 2,
+	VFP_NULL = 2,	// signal bypass, never returned by VFP_Suck()
 };

 typedef enum vfp_status vfp_init_f(VRT_CTX, struct vfp_ctx *,