[master] 184c8980e VRT_VSC_Alloc() renamed to VRT_VSC_Allocv()

Walid Boudebouda walid.boudebouda at gmail.com
Wed Apr 16 08:35:05 UTC 2025


commit 184c8980ed45d5940d4bbc2dd6121cfc4b43846c
Author: Guillaume Quintard <guillaume.quintard at varnish-software.com>
Date:   Fri Apr 11 09:22:28 2025 -0700

    VRT_VSC_Alloc() renamed to VRT_VSC_Allocv()

diff --git a/bin/varnishd/common/common_vsc.c b/bin/varnishd/common/common_vsc.c
index 8455e4d95..6c6cc9de3 100644
--- a/bin/varnishd/common/common_vsc.c
+++ b/bin/varnishd/common/common_vsc.c
@@ -135,7 +135,7 @@ VRT_VSC_Reveal(const struct vsc_seg *vsg)
 }
 
 void *
-VRT_VSC_Alloc(struct vsmw_cluster *vc, struct vsc_seg **sg,
+VRT_VSC_Allocv(struct vsmw_cluster *vc, struct vsc_seg **sg,
     const char *nm, size_t sd,
     const unsigned char *jp, size_t sj, const char *fmt, va_list va)
 {
diff --git a/include/vrt.h b/include/vrt.h
index 2252cdc74..0dd5a064d 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -60,6 +60,7 @@
  * XX.X (unreleased)
  *	typedef hdr_t added
  *	struct gethdr_s.what changed to hdr_t
+ *	VRT_VSC_Alloc() renamed to VRT_VSC_Allocv()
  * 21.0 (2025-03-17)
  *	VRT_u_req_grace() added
  *	VRT_u_req_ttl() added
@@ -852,7 +853,7 @@ struct vsmw_cluster *VRT_VSM_Cluster_New(VRT_CTX, size_t);
 void VRT_VSM_Cluster_Destroy(VRT_CTX, struct vsmw_cluster **);
 
 #ifdef va_start	// XXX: hackish
-void *VRT_VSC_Alloc(struct vsmw_cluster *, struct vsc_seg **,
+void *VRT_VSC_Allocv(struct vsmw_cluster *, struct vsc_seg **,
     const char *, size_t, const unsigned char *, size_t, const char *, va_list);
 #endif
 void VRT_VSC_Destroy(const char *, struct vsc_seg *);
diff --git a/lib/libvsc/vsctool.py b/lib/libvsc/vsctool.py
index db2a396dc..85e2b07c3 100755
--- a/lib/libvsc/vsctool.py
+++ b/lib/libvsc/vsctool.py
@@ -270,7 +270,7 @@ class CounterSet(object):
         fo.write("\t" + self.struct + " *retval;\n")
         fo.write("\n")
         fo.write("\tva_start(ap, fmt);\n")
-        fo.write("\tretval = VRT_VSC_Alloc")
+        fo.write("\tretval = VRT_VSC_Allocv")
         fo.write("(vc, sg, vsc_" + self.name + "_name, ")
         fo.write("VSC_" + self.name + "_size,\n")
         fo.write("\t    vsc_" + self.name + "_json, ")


More information about the varnish-commit mailing list