Rename zfr_iter -> zfr_iter_ws

src/vmod_zipflow.c

@@ -543,7 +543,7 @@ zft_iter_req_body(struct zipflow_top *zft)
 
 	if (zft->body_req) {
 		(void) VRB_Iterate(req->wrk, req->vsl, req,
-		    zfr_iter, (void *)zis);
+		    zfr_iter_ws, (void *)zis);
 		zfr_iter_fini(zis);
 	}
 }
@@ -764,7 +764,7 @@ vdp_zipflow_bytes(struct vdp_ctx *vdc, enum vdp_action act, void **priv,
 	zft = zfr->top;
 
 	if (zft->zis != NULL) {
-		r = zfr_iter(zft->zis, (act == VDP_END) ? OBJ_ITER_END : 0,
+		r = zfr_iter_ws(zft->zis, (act == VDP_END) ? OBJ_ITER_END : 0,
 		    ptr, len);
 	}
 	else

src/zfr_iter.c

@@ -73,8 +73,9 @@ static const char *DBG_begin;
 #define DBG_VALID(p)		(void)0
 #endif
 
+/* iterate over whitespace separated input */
 int
-zfr_iter(void *priv, unsigned flush, const void *ptr, ssize_t alen)
+zfr_iter_ws(void *priv, unsigned flush, const void *ptr, ssize_t alen)
 {
 	const char *pp, *p, *e, *h, *u;
 	struct zfr_iter_s *zis;
@@ -197,7 +198,7 @@ zfr_iter_fini(struct zfr_iter_s *zis)
 	CHECK_OBJ_NOTNULL(zis, ZFR_ITER_MAGIC);
 
 	if (zis->len > 0 && zis->end_seen == 0)
-		(void) zfr_iter(zis, OBJ_ITER_END, "", (ssize_t)0);
+		(void) zfr_iter_ws(zis, OBJ_ITER_END, "", (ssize_t)0);
 	free(zis->buf);
 	zis->buf = NULL;
 	zis->len = 0;
@@ -312,9 +313,9 @@ t_steps(const struct expect *want, unsigned n, const char *s)
 		for (t = s, l = strlen(t);
 		     l > step;
 		     l -= step, t += step)
-			zfr_iter(zis, 0, t, step);
+			zfr_iter_ws(zis, 0, t, step);
 		AN(l);
-		zfr_iter(zis, OBJ_ITER_END, t, l);
+		zfr_iter_ws(zis, OBJ_ITER_END, t, l);
 		AN(zis->end_seen);
 		assert(wp->count == n);
 	}
@@ -338,7 +339,7 @@ main(void) {
 		INIT_OBJ(zis, ZFR_ITER_MAGIC);
 		zis->priv = NULL;
 		zis->func = cb_not;
-		zfr_iter(zis, 0, "", 0);
+		zfr_iter_ws(zis, 0, "", 0);
 
 		n = 0;
 		*s = '\0';

src/zfr_iter.h

@@ -42,5 +42,5 @@ struct zfr_iter_s {
 };
 
 void zfr_iter_fini(struct zfr_iter_s *zis);
-int zfr_iter(void *, unsigned flush,
+int zfr_iter_ws(void *, unsigned flush,
     const void *ptr, ssize_t len);