[master] 403c05c1c Clarify the difference between `objiterator` and `objiterate` in function names.

Poul-Henning Kamp phk at FreeBSD.org
Tue Dec 13 15:33:05 UTC 2022


commit 403c05c1c8110b84a33178d7603a2d7005fd1657
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 13 12:57:01 2022 +0000

    Clarify the difference between `objiterator` and `objiterate` in function names.

diff --git a/bin/varnishd/cache/cache_deliver_proc.c b/bin/varnishd/cache/cache_deliver_proc.c
index 2749b798e..44507eb5a 100644
--- a/bin/varnishd/cache/cache_deliver_proc.c
+++ b/bin/varnishd/cache/cache_deliver_proc.c
@@ -215,7 +215,7 @@ VDP_Close(struct vdp_ctx *vdc)
 /*--------------------------------------------------------------------*/
 
 static int v_matchproto_(objiterate_f)
-vdp_objiterator(void *priv, unsigned flush, const void *ptr, ssize_t len)
+vdp_objiterate(void *priv, unsigned flush, const void *ptr, ssize_t len)
 {
 	enum vdp_action act;
 
@@ -241,7 +241,7 @@ VDP_DeliverObj(struct vdp_ctx *vdc, struct objcore *oc)
 	AN(vdc->vsl);
 	vdc->req = NULL;
 	final = oc->flags & (OC_F_PRIVATE | OC_F_HFM | OC_F_HFP) ? 1 : 0;
-	r = ObjIterate(vdc->wrk, oc, vdc, vdp_objiterator, final);
+	r = ObjIterate(vdc->wrk, oc, vdc, vdp_objiterate, final);
 	if (r < 0)
 		return (r);
 	return (0);
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 2875d2f91..343a28102 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -764,7 +764,7 @@ vbf_stp_fetchend(struct worker *wrk, struct busyobj *bo)
  */
 
 static int v_matchproto_(objiterate_f)
-vbf_objiterator(void *priv, unsigned flush, const void *ptr, ssize_t len)
+vbf_objiterate(void *priv, unsigned flush, const void *ptr, ssize_t len)
 {
 	struct busyobj *bo;
 	ssize_t l;
@@ -852,7 +852,7 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
 		ObjSetState(wrk, oc, BOS_STREAM);
 	}
 
-	if (ObjIterate(wrk, stale_oc, bo, vbf_objiterator, 0))
+	if (ObjIterate(wrk, stale_oc, bo, vbf_objiterate, 0))
 		(void)VFP_Error(bo->vfc, "Template object failed");
 
 	if (bo->vfc->failed) {


More information about the varnish-commit mailing list