[master] 49641a8d1 Stash more internal stuff away (re: #2800)

[Poul-Henning Kamp]

commit 49641a8d1c26f971b0e09f2ae26b41270213c251
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Oct 27 22:16:52 2020 +0000

    Stash more internal stuff away (re: #2800)

diff --git a/bin/varnishd/cache/cache_filter.h b/bin/varnishd/cache/cache_filter.h
index e3b3cc613..ff07ac563 100644
--- a/bin/varnishd/cache/cache_filter.h
+++ b/bin/varnishd/cache/cache_filter.h
@@ -32,6 +32,7 @@
 struct req;
 struct vfp_entry;
 struct vfp_ctx;
+struct vdp_ctx;
 
 /* Fetch processors --------------------------------------------------*/
 
@@ -87,7 +88,6 @@ struct vfp_ctx {
 	unsigned		obj_flags;
 };
 
-struct vfp_entry *VFP_Push(struct vfp_ctx *, const struct vfp *);
 enum vfp_status VFP_Suck(struct vfp_ctx *, void *p, ssize_t *lp);
 enum vfp_status VFP_Error(struct vfp_ctx *, const char *fmt, ...)
     v_printflike_(2, 3);
@@ -110,8 +110,6 @@ typedef int vdp_init_f(struct vdp_ctx *, void **priv);
  *	positive:	Don't push this VDP anyway
  */
 
-struct vdp_ctx;
-
 typedef int vdp_fini_f(struct vdp_ctx *, void **priv);
 typedef int vdp_bytes_f(struct vdp_ctx *, enum vdp_action, void **priv,
     const void *ptr, ssize_t len);
@@ -148,17 +146,6 @@ struct vdp_ctx {
 	struct req		*req;
 };
 
-extern const struct vdp VDP_gunzip;
-extern const struct vdp VDP_esi;
-extern const struct vdp VDP_range;
-
-void VDP_Init(struct vdp_ctx *vdx, struct worker *wrk, struct vsl_log *vsl,
-    struct req *req);
-
-uint64_t VDP_Close(struct vdp_ctx *);
-int VDP_DeliverObj(struct vdp_ctx *vdc, struct objcore *oc);
-
-int VDP_bytes(struct vdp_ctx *, enum vdp_action act, const void *ptr, ssize_t len);
-int VDP_Push(struct vdp_ctx *, struct ws *, const struct vdp *, void *priv);
+int VDP_bytes(struct vdp_ctx *, enum vdp_action act, const void *, ssize_t);
 void VRT_AddVDP(VRT_CTX, const struct vdp *);
 void VRT_RemoveVDP(VRT_CTX, const struct vdp *);
diff --git a/bin/varnishd/cache/cache_varnishd.h b/bin/varnishd/cache/cache_varnishd.h
index 6446699e2..835e74d7e 100644
--- a/bin/varnishd/cache/cache_varnishd.h
+++ b/bin/varnishd/cache/cache_varnishd.h
@@ -50,6 +50,7 @@
 /*--------------------------------------------------------------------*/
 
 struct vfp;
+struct vdp;
 struct cli_proto;
 struct poolparam;
 
@@ -174,7 +175,16 @@ void VDI_Event(const struct director *d, enum vcl_event_e ev);
 void VDI_Init(void);
 
 /* cache_deliver_proc.c */
+void VDP_Init(struct vdp_ctx *vdx, struct worker *wrk, struct vsl_log *vsl,
+    struct req *req);
+uint64_t VDP_Close(struct vdp_ctx *);
 void VDP_Panic(struct vsb *vsb, const struct vdp_ctx *vdc);
+int VDP_Push(struct vdp_ctx *, struct ws *, const struct vdp *, void *priv);
+int VDP_DeliverObj(struct vdp_ctx *vdc, struct objcore *oc);
+extern const struct vdp VDP_gunzip;
+extern const struct vdp VDP_esi;
+extern const struct vdp VDP_range;
+
 
 /* cache_exp.c */
 vtim_real EXP_Ttl(const struct req *, const struct objcore *);
@@ -253,6 +263,7 @@ void Bereq_Rollback(struct busyobj *);
 
 /* cache_fetch_proc.c */
 void VFP_Init(void);
+struct vfp_entry *VFP_Push(struct vfp_ctx *, const struct vfp *);
 enum vfp_status VFP_GetStorage(struct vfp_ctx *, ssize_t *sz, uint8_t **ptr);
 void VFP_Extend(const struct vfp_ctx *, ssize_t sz, enum vfp_status);
 void VFP_Setup(struct vfp_ctx *vc, struct worker *wrk);