[master] 39ee90b5b vrt: Remove VRT_{Add,Remove}_{VDP,VFP}
Nils Goroll
nils.goroll at uplex.de
Wed Jul 9 13:53:05 UTC 2025
commit 39ee90b5b8d0188a541ef627c694b4cc8bf3a05c
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Wed Jul 9 15:48:12 2025 +0200
vrt: Remove VRT_{Add,Remove}_{VDP,VFP}
Ref #3352
diff --git a/bin/varnishd/cache/cache_filter.h b/bin/varnishd/cache/cache_filter.h
index a24d669fc..d9f7141f6 100644
--- a/bin/varnishd/cache/cache_filter.h
+++ b/bin/varnishd/cache/cache_filter.h
@@ -102,9 +102,6 @@ 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);
-void v_deprecated_ VRT_AddVFP(VRT_CTX, const struct vfp *);
-void v_deprecated_ VRT_RemoveVFP(VRT_CTX, const struct vfp *);
-
/* Deliver processors ------------------------------------------------*/
enum vdp_action {
@@ -324,9 +321,6 @@ int VDPIO_Init(struct vdp_ctx *vdc, struct objcore *oc, struct ws *ws,
void VDPIO_Return(const struct vdp_ctx *vdc);
void VDPIO_Fini(struct vdp_ctx *vdc);
-void v_deprecated_ VRT_AddVDP(VRT_CTX, const struct vdp *);
-void v_deprecated_ VRT_RemoveVDP(VRT_CTX, const struct vdp *);
-
/* Registry functions -------------------------------------------------*/
const char *VRT_AddFilter(VRT_CTX, const struct vfp *, const struct vdp *);
void VRT_RemoveFilter(VRT_CTX, const struct vfp *, const struct vdp *);
diff --git a/bin/varnishd/cache/cache_vrt_filter.c b/bin/varnishd/cache/cache_vrt_filter.c
index 2ebe3183d..025a1f57d 100644
--- a/bin/varnishd/cache/cache_vrt_filter.c
+++ b/bin/varnishd/cache/cache_vrt_filter.c
@@ -135,18 +135,6 @@ VRT_AddFilter(VRT_CTX, const struct vfp *vfp, const struct vdp *vdp)
return (vrt_addfilter(ctx, vfp, vdp));
}
-void
-VRT_AddVFP(VRT_CTX, const struct vfp *filter)
-{
- AZ(VRT_AddFilter(ctx, filter, NULL));
-}
-
-void
-VRT_AddVDP(VRT_CTX, const struct vdp *filter)
-{
- AZ(VRT_AddFilter(ctx, NULL, filter));
-}
-
void
VRT_RemoveFilter(VRT_CTX, const struct vfp *vfp, const struct vdp *vdp)
{
@@ -174,20 +162,6 @@ VRT_RemoveFilter(VRT_CTX, const struct vfp *vfp, const struct vdp *vdp)
FREE_OBJ(vp);
}
-void
-VRT_RemoveVFP(VRT_CTX, const struct vfp *filter)
-{
-
- VRT_RemoveFilter(ctx, filter, NULL);
-}
-
-void
-VRT_RemoveVDP(VRT_CTX, const struct vdp *filter)
-{
-
- VRT_RemoveFilter(ctx, NULL, filter);
-}
-
static const struct vfilter vfilter_error[1] = {{0}};
static const struct vfilter *
diff --git a/include/vrt.h b/include/vrt.h
index 0c17c956f..dabc33c47 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -82,6 +82,10 @@
* VRT_r_param_timeout_idle() added
* VRT_r_param_transit_buffer() added
* VRT_r_param_uncacheable_ttl() added
+ * VRT_AddVFP() removed
+ * VRT_AddVDP() removed
+ * VRT_RemoveVFP() removed
+ * VRT_RemoveVDP() removed
* 21.0 (2025-03-17)
* VRT_u_req_grace() added
* VRT_u_req_ttl() added
More information about the varnish-commit
mailing list