[master] 6def39b staticize STV_find() as stv_find()

Poul-Henning Kamp phk at FreeBSD.org
Wed Nov 29 09:58:11 UTC 2017


commit 6def39b11ff251ed4c85dd118207728c7f081c88
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 29 09:56:49 2017 +0000

    staticize STV_find() as stv_find()

diff --git a/bin/varnishd/cache/cache_varnishd.h b/bin/varnishd/cache/cache_varnishd.h
index 21b1e63..183be32 100644
--- a/bin/varnishd/cache/cache_varnishd.h
+++ b/bin/varnishd/cache/cache_varnishd.h
@@ -240,7 +240,6 @@ void V2D_Init(void);
 /* stevedore.c */
 void STV_open(void);
 void STV_close(void);
-const struct stevedore *STV_find(const char *);
 const struct stevedore *STV_next(void);
 int STV_BanInfoDrop(const uint8_t *ban, unsigned len);
 int STV_BanInfoNew(const uint8_t *ban, unsigned len);
diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c
index 7790351..c9e80f6 100644
--- a/bin/varnishd/storage/stevedore.c
+++ b/bin/varnishd/storage/stevedore.c
@@ -179,8 +179,8 @@ STV_BanExport(const uint8_t *bans, unsigned len)
  * VRT functions for stevedores
  */
 
-const struct stevedore *
-STV_find(const char *nm)
+static const struct stevedore *
+stv_find(const char *nm)
 {
 	struct stevedore *stv;
 
@@ -194,7 +194,7 @@ int
 VRT_Stv(const char *nm)
 {
 
-	if (STV_find(nm) != NULL)
+	if (stv_find(nm) != NULL)
 		return (1);
 	return (0);
 }
@@ -211,7 +211,7 @@ VRT_STEVEDORE_string(VCL_STEVEDORE s)
 VCL_STEVEDORE
 VRT_stevedore(const char *nm)
 {
-	return (STV_find(nm));
+	return (stv_find(nm));
 }
 
 #define VRTSTVVAR(nm, vtype, ctype, dval)	\
@@ -220,7 +220,7 @@ VRT_Stv_##nm(const char *nm)			\
 {						\
 	const struct stevedore *stv;		\
 						\
-	stv = STV_find(nm);			\
+	stv = stv_find(nm);			\
 	if (stv == NULL)			\
 		return (dval);			\
 	if (stv->var_##nm == NULL)		\


More information about the varnish-commit mailing list