[master] 7c3fdb42b Move VRT_BundleStrands() to VPI_BundleStrands()

[Poul-Henning Kamp]

commit 7c3fdb42b53227d816d429d9231f4c6b39d1bfed
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Jun 18 07:14:13 2019 +0000

    Move VRT_BundleStrands() to VPI_BundleStrands()

diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index 81cc12b09..348344846 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -179,7 +179,7 @@ VRT_GetHdr(VRT_CTX, const struct gethdr_s *hs)
  */
 
 VCL_STRANDS
-VRT_BundleStrands(int n, struct strands *s, char const **d, const char *f, ...)
+VPI_BundleStrands(int n, struct strands *s, char const **d, const char *f, ...)
 {
 	va_list ap;
 
diff --git a/include/vcc_interface.h b/include/vcc_interface.h
index 682767265..78dcccdcf 100644
--- a/include/vcc_interface.h
+++ b/include/vcc_interface.h
@@ -64,3 +64,5 @@ struct vrt_acl {
 	const char	*name;
 };
 
+VCL_STRANDS VPI_BundleStrands(int, struct strands *, char const **,
+    const char *f, ...);
diff --git a/include/vrt.h b/include/vrt.h
index 4cb78e002..92f3e71fa 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -52,6 +52,7 @@
  * binary/load-time compatible, increment MAJOR version
  *
  * unreleased (planned for 2019-09-15)
+ *	VRT_BundleStrands() moved to vcc_interface.h
  *	VRT_VCL_{Busy|Unbusy} changed to VRT_VCL_{Prevent|Allow}_Cold
  *	VRT_re[fl]_vcl changed to VRT_VCL_{Prevent|Allow}_Discard
  *	VRT_Vmod_{Init|Unload} moved to vcc_interface.h
@@ -528,8 +529,6 @@ VCL_STEVEDORE VRT_stevedore(const char *nm);
 
 /* Convert things to string */
 
-VCL_STRANDS VRT_BundleStrands(int, struct strands *, char const **,
-    const char *f, ...);
 int VRT_CompareStrands(VCL_STRANDS a, VCL_STRANDS b);
 char *VRT_Strands(char *, size_t, VCL_STRANDS);
 VCL_STRING VRT_StrandsWS(struct ws *, const char *, VCL_STRANDS);
diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index 6301cb722..a23f61f35 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -186,7 +186,7 @@ vcc_expr_edit(struct vcc *tl, vcc_type_t fmt, const char *p, struct expr *e1,
 			    "  const char * strs_%u_s[%d];\n",
 			    tl->unique, tl->unique, e3->nstr);
 			VSB_printf(e->vsb,
-			    "VRT_BundleStrands(%d, &strs_%u_a, strs_%u_s,"
+			    "VPI_BundleStrands(%d, &strs_%u_a, strs_%u_s,"
 			    "\v+\n%s,\nvrt_magic_string_end\v-\n)",
 			    e3->nstr, tl->unique, tl->unique,
 			VSB_data(e3->vsb));