Commit 403c05c1 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

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

parent 26dfe252
...@@ -215,7 +215,7 @@ VDP_Close(struct vdp_ctx *vdc) ...@@ -215,7 +215,7 @@ VDP_Close(struct vdp_ctx *vdc)
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
static int v_matchproto_(objiterate_f) 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; enum vdp_action act;
...@@ -241,7 +241,7 @@ VDP_DeliverObj(struct vdp_ctx *vdc, struct objcore *oc) ...@@ -241,7 +241,7 @@ VDP_DeliverObj(struct vdp_ctx *vdc, struct objcore *oc)
AN(vdc->vsl); AN(vdc->vsl);
vdc->req = NULL; vdc->req = NULL;
final = oc->flags & (OC_F_PRIVATE | OC_F_HFM | OC_F_HFP) ? 1 : 0; 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) if (r < 0)
return (r); return (r);
return (0); return (0);
......
...@@ -764,7 +764,7 @@ vbf_stp_fetchend(struct worker *wrk, struct busyobj *bo) ...@@ -764,7 +764,7 @@ vbf_stp_fetchend(struct worker *wrk, struct busyobj *bo)
*/ */
static int v_matchproto_(objiterate_f) 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; struct busyobj *bo;
ssize_t l; ssize_t l;
...@@ -852,7 +852,7 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo) ...@@ -852,7 +852,7 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
ObjSetState(wrk, oc, BOS_STREAM); 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"); (void)VFP_Error(bo->vfc, "Template object failed");
if (bo->vfc->failed) { if (bo->vfc->failed) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment