Output the name of duplicate filters

The error message for duplicate filters did not mention the filter name
and was thus not particularly helpful. It does now, for example:

	rot13: VFP already registered (per-vcl)
parent 03a36ac7
...@@ -103,7 +103,7 @@ vrt_addfilter(VRT_CTX, const struct vfp *vfp, const struct vdp *vdp) ...@@ -103,7 +103,7 @@ vrt_addfilter(VRT_CTX, const struct vfp *vfp, const struct vdp *vdp)
err = is_dup_filter(hd, vfp, vdp, name); err = is_dup_filter(hd, vfp, vdp, name);
if (err != NULL) { if (err != NULL) {
if (ctx != NULL) if (ctx != NULL)
VRT_fail(ctx, "%s (global)", err); VRT_fail(ctx, "%s: %s (global)", name, err);
return (err); return (err);
} }
if (ctx != NULL) { if (ctx != NULL) {
...@@ -112,7 +112,7 @@ vrt_addfilter(VRT_CTX, const struct vfp *vfp, const struct vdp *vdp) ...@@ -112,7 +112,7 @@ vrt_addfilter(VRT_CTX, const struct vfp *vfp, const struct vdp *vdp)
hd = &ctx->vcl->filters; hd = &ctx->vcl->filters;
err = is_dup_filter(hd, vfp, vdp, name); err = is_dup_filter(hd, vfp, vdp, name);
if (err != NULL) { if (err != NULL) {
VRT_fail(ctx, "%s (per-vcl)", err); VRT_fail(ctx, "%s: %s (per-vcl)", name, err);
return (err); return (err);
} }
} }
......
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