[master] a0e0b0d26 VRT_acl_log -> VPI_acl_log

[Poul-Henning Kamp]

commit a0e0b0d268d6ef912747600b18421349a5065918
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Feb 4 07:36:43 2021 +0000

    VRT_acl_log -> VPI_acl_log

diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index 3e2b67260..9421f529d 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -101,7 +101,7 @@ VRT_synth(VRT_CTX, VCL_INT code, VCL_STRING reason)
 /*--------------------------------------------------------------------*/
 
 void
-VRT_acl_log(VRT_CTX, const char *msg)
+VPI_acl_log(VRT_CTX, const char *msg)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
diff --git a/include/vcc_interface.h b/include/vcc_interface.h
index 1d46dc0b0..353cb0d45 100644
--- a/include/vcc_interface.h
+++ b/include/vcc_interface.h
@@ -69,6 +69,8 @@ struct vrt_acl {
 	const char	*name;
 };
 
+void VPI_acl_log(VRT_CTX, const char *);
+
 /* vmod object instance info */
 struct vpi_ii {
 	const void *			p;
diff --git a/include/vrt.h b/include/vrt.h
index 73840c790..899f8c85a 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -461,7 +461,6 @@ VCL_BACKEND VRT_DirectorResolve(VRT_CTX, VCL_BACKEND);
  * Implementation details of ACLs
  */
 
-void VRT_acl_log(VRT_CTX, const char *);
 int VRT_acl_match(VRT_CTX, VCL_ACL, VCL_IP);
 
 /***********************************************************************
diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index 361e900c7..35573eb3f 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -445,7 +445,7 @@ vcc_acl_emit(struct vcc *tl, const char *name, const char *rname, int anon)
 	Fh(tl, 0, "\n");
 	Fh(tl, 0, "\tfam = VRT_VSA_GetPtr(ctx, p, &a);\n");
 	Fh(tl, 0, "\tif (fam < 0) {\n");
-	Fh(tl, 0, "\t\tVRT_acl_log(ctx, \"NO_FAM %s\");\n", name);
+	Fh(tl, 0, "\t\tVPI_acl_log(ctx, \"NO_FAM %s\");\n", name);
 	Fh(tl, 0, "\t\treturn(0);\n");
 	Fh(tl, 0, "\t}\n\n");
 	if (!tl->err_unref && !anon) {
@@ -499,7 +499,7 @@ vcc_acl_emit(struct vcc *tl, const char *name, const char *rname, int anon)
 		i = ((int)ae->mask + 7) / 8;
 
 		if (!anon) {
-			Fh(tl, 0, "\t%*sVRT_acl_log(ctx, \"%sMATCH %s \" ",
+			Fh(tl, 0, "\t%*sVPI_acl_log(ctx, \"%sMATCH %s \" ",
 			    -i, "", ae->not ? "NEG_" : "", name);
 			t = ae->t_addr;
 			do {
@@ -529,7 +529,7 @@ vcc_acl_emit(struct vcc *tl, const char *name, const char *rname, int anon)
 
 	/* Deny by default */
 	if (!anon)
-		Fh(tl, 0, "\tVRT_acl_log(ctx, \"NO_MATCH %s\");\n", name);
+		Fh(tl, 0, "\tVPI_acl_log(ctx, \"NO_MATCH %s\");\n", name);
 	Fh(tl, 0, "\treturn (0);\n}\n");
 
 	if (!anon) {