Mailing List Archive

[master] fca8c59aa Back to the originally proposed name VRT_DirectorResolve()
commit fca8c59aa07e9eb6b761dd2a5258855630c950e9
Author: Nils Goroll <nils.goroll@uplex.de>
Date: Tue Jun 23 19:39:32 2020 +0200

Back to the originally proposed name VRT_DirectorResolve()

Ref
https://github.com/varnishcache/varnish-cache/pull/3315#discussion_r429796022

OKed by phk on irc.

VRT_DirectorResolve() was the name originally proposed in #2680, which
was renamed in #3311 and accepted by me to get ahead. Not that Dridi
prefers the original name and phk goes along, we change it back before
the next release.

diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index 1aa4388d5..c7e701026 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -81,7 +81,7 @@ VDI_Ahealth(const struct director *d)
/* Resolve director --------------------------------------------------*/

VCL_BACKEND
-VRT_VDI_Resolve(VRT_CTX, VCL_BACKEND d)
+VRT_DirectorResolve(VRT_CTX, VCL_BACKEND d)
{
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);

@@ -116,7 +116,7 @@ VDI_Resolve(VRT_CTX)
}

CHECK_OBJ(bo->director_req, DIRECTOR_MAGIC);
- d = VRT_VDI_Resolve(ctx, bo->director_req);
+ d = VRT_DirectorResolve(ctx, bo->director_req);
if (d != NULL)
return (d);

diff --git a/include/vrt.h b/include/vrt.h
index 3b015ff6a..e38b9bf8f 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -54,7 +54,7 @@
* binary/load-time compatible, increment MAJOR version
*
* NEXT (2020-09-15)
- * VRT_VDI_Resolve() added
+ * VRT_DirectorResolve() added
* 11.0 (2020-03-16)
* Changed type of vsa_suckaddr_len from int to size_t
* New prefix_{ptr|len} fields in vrt_backend
@@ -437,7 +437,7 @@ struct vrt_backend_probe {
VRT_BACKEND_PROBE_FIELDS(const)
};

-VCL_BACKEND VRT_VDI_Resolve(VRT_CTX, VCL_BACKEND);
+VCL_BACKEND VRT_DirectorResolve(VRT_CTX, VCL_BACKEND);

/***********************************************************************
* Implementation details of ACLs
diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index 1b0494e11..a459dd757 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -839,7 +839,7 @@ static const struct vcc_methods {

{ STRINGS, STRING, "upper", "VRT_UpperLowerStrands(ctx, \vT, 1)", 1 },
{ STRINGS, STRING, "lower", "VRT_UpperLowerStrands(ctx, \vT, 0)", 1 },
- { BACKEND, BACKEND, "resolve", "VRT_VDI_Resolve(ctx, \v1)", 1 },
+ { BACKEND, BACKEND, "resolve", "VRT_DirectorResolve(ctx, \v1)", 1 },

{ NULL, NULL, NULL, NULL},
};
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
Re: [master] fca8c59aa Back to the originally proposed name VRT_DirectorResolve() [ In reply to ]
On 23/06/2020 19:47, Nils Goroll wrote:
> Not that Dridi

Typo, sorry: *Now* that Dridi...