[master] dd3d865c6 Hide tweak_generic_uint()

Poul-Henning Kamp phk at FreeBSD.org
Mon Oct 21 11:56:07 UTC 2019


commit dd3d865c668106a15d94c23e80d578894160dbbd
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Oct 21 12:09:20 2019 +0200

    Hide tweak_generic_uint()
    
    It is only really needed for one last use case.

diff --git a/bin/varnishd/mgt/mgt_param.h b/bin/varnishd/mgt/mgt_param.h
index 82eda8671..c1e799874 100644
--- a/bin/varnishd/mgt/mgt_param.h
+++ b/bin/varnishd/mgt/mgt_param.h
@@ -74,10 +74,6 @@ tweak_t tweak_uint;
 tweak_t tweak_vsl_buffer;
 tweak_t tweak_vsl_reclen;
 
-int tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest,
-    const char *arg, const char *min, const char *max,
-    const char *min_reason, const char *max_reason);
-
 extern struct parspec mgt_parspec[]; /* mgt_param_tbl.c */
 extern struct parspec VSL_parspec[]; /* mgt_param_vsl.c */
 extern struct parspec WRK_parspec[]; /* mgt_pool.c */
diff --git a/bin/varnishd/mgt/mgt_param_tweak.c b/bin/varnishd/mgt/mgt_param_tweak.c
index ac557fd58..fcb9a3bd5 100644
--- a/bin/varnishd/mgt/mgt_param_tweak.c
+++ b/bin/varnishd/mgt/mgt_param_tweak.c
@@ -156,7 +156,7 @@ tweak_bool(struct vsb *vsb, const struct parspec *par, const char *arg)
 
 /*--------------------------------------------------------------------*/
 
-int
+static int
 tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg,
     const char *min, const char *max,
     const char *min_reason, const char *max_reason)
diff --git a/bin/varnishd/mgt/mgt_pool.c b/bin/varnishd/mgt/mgt_pool.c
index 3ec53f743..8fb30ede5 100644
--- a/bin/varnishd/mgt/mgt_pool.c
+++ b/bin/varnishd/mgt/mgt_pool.c
@@ -58,8 +58,7 @@ tweak_thread_pool_min(struct vsb *vsb, const struct parspec *par,
     const char *arg)
 {
 
-	if (tweak_generic_uint(vsb, par->priv, arg, par->min, par->max,
-	    par->dyn_min_reason, par->dyn_max_reason))
+	if (tweak_uint(vsb, par, arg))
 		return (-1);
 
 	MCF_ParamConf(MCF_MINIMUM, "thread_pool_max",
@@ -74,8 +73,7 @@ tweak_thread_pool_max(struct vsb *vsb, const struct parspec *par,
     const char *arg)
 {
 
-	if (tweak_generic_uint(vsb, par->priv, arg, par->min, par->max,
-	    par->dyn_min_reason, par->dyn_max_reason))
+	if (tweak_uint(vsb, par, arg))
 		return (-1);
 
 	MCF_ParamConf(MCF_MAXIMUM, "thread_pool_min",


More information about the varnish-commit mailing list