[master] aebdba1ab Undo the enum tweak change

[Poul-Henning Kamp]

commit aebdba1ab6cb99c1916b7d3d19d6c056d04777ca
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri Oct 18 16:04:52 2019 +0200

    Undo the enum tweak change

diff --git a/bin/varnishd/mgt/mgt_param.h b/bin/varnishd/mgt/mgt_param.h
index 1ce2bdc5f..82eda8671 100644
--- a/bin/varnishd/mgt/mgt_param.h
+++ b/bin/varnishd/mgt/mgt_param.h
@@ -74,14 +74,7 @@ tweak_t tweak_uint;
 tweak_t tweak_vsl_buffer;
 tweak_t tweak_vsl_reclen;
 
-enum tweak_e {
-	TWEAK_OK,
-	TWEAK_ERR,
-	TWEAK_BELOW_MIN,
-	TWEAK_ABOVE_MAX,
-};
-
-enum tweak_e tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest,
+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_param_tweak.c b/bin/varnishd/mgt/mgt_param_tweak.c
index 3ae97aa95..ac557fd58 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)
 
 /*--------------------------------------------------------------------*/
 
-enum tweak_e
+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)
@@ -170,7 +170,7 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg,
 			minv = strtoul(min, &p, 0);
 			if (*arg == '\0' || *p != '\0') {
 				VSB_printf(vsb, "Illegal Min: %s\n", min);
-				return (TWEAK_ERR);
+				return (-1);
 			}
 		}
 		if (max != NULL) {
@@ -178,7 +178,7 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg,
 			maxv = strtoul(max, &p, 0);
 			if (*arg == '\0' || *p != '\0') {
 				VSB_printf(vsb, "Illegal Max: %s\n", max);
-				return (TWEAK_ERR);
+				return (-1);
 			}
 		}
 		p = NULL;
@@ -188,7 +188,7 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg,
 			u = strtoul(arg, &p, 0);
 			if (*arg == '\0' || *p != '\0') {
 				VSB_printf(vsb, "Not a number (%s)\n", arg);
-				return (TWEAK_ERR);
+				return (-1);
 			}
 		}
 		if (min != NULL && u < minv) {
@@ -196,14 +196,14 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg,
 			if (min_reason != NULL)
 				VSB_printf(vsb, " %s", min_reason);
 			VSB_putc(vsb, '\n');
-			return (TWEAK_BELOW_MIN);
+			return (-1);
 		}
 		if (max != NULL && u > maxv) {
 			VSB_printf(vsb, "Must be no more than %s", max);
 			if (max_reason != NULL)
 				VSB_printf(vsb, " %s", max_reason);
 			VSB_putc(vsb, '\n');
-			return (TWEAK_ABOVE_MAX);
+			return (-1);
 		}
 		*dest = u;
 	} else if (*dest == UINT_MAX && arg != JSON_FMT) {
@@ -211,7 +211,7 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg,
 	} else {
 		VSB_printf(vsb, "%u", *dest);
 	}
-	return (TWEAK_OK);
+	return (0);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/mgt/mgt_pool.c b/bin/varnishd/mgt/mgt_pool.c
index b2728de6d..3ec53f743 100644
--- a/bin/varnishd/mgt/mgt_pool.c
+++ b/bin/varnishd/mgt/mgt_pool.c
@@ -57,38 +57,30 @@ static int
 tweak_thread_pool_min(struct vsb *vsb, const struct parspec *par,
     const char *arg)
 {
-	enum tweak_e tweak;
 
-	tweak = tweak_generic_uint(vsb, par->priv, arg, par->min, par->max,
-	    par->dyn_min_reason, par->dyn_max_reason);
+	if (tweak_generic_uint(vsb, par->priv, arg, par->min, par->max,
+	    par->dyn_min_reason, par->dyn_max_reason))
+		return (-1);
 
-	if (tweak == TWEAK_OK) {
-		MCF_ParamConf(MCF_MINIMUM, "thread_pool_max",
-		    "%u", mgt_param.wthread_min);
-		MCF_ParamConf(MCF_MAXIMUM, "thread_pool_reserve",
-		    "%u", mgt_param.wthread_min * 950 / 1000);
-		return (0);
-	}
-
-	return (-1);
+	MCF_ParamConf(MCF_MINIMUM, "thread_pool_max",
+	    "%u", mgt_param.wthread_min);
+	MCF_ParamConf(MCF_MAXIMUM, "thread_pool_reserve",
+	    "%u", mgt_param.wthread_min * 950 / 1000);
+	return (0);
 }
 
 static int
 tweak_thread_pool_max(struct vsb *vsb, const struct parspec *par,
     const char *arg)
 {
-	enum tweak_e tweak;
-
-	tweak = tweak_generic_uint(vsb, par->priv, arg, par->min, par->max,
-	    par->dyn_min_reason, par->dyn_max_reason);
 
-	if (tweak == TWEAK_OK) {
-		MCF_ParamConf(MCF_MAXIMUM, "thread_pool_min",
-		    "%u", mgt_param.wthread_max);
-		return (0);
-	}
+	if (tweak_generic_uint(vsb, par->priv, arg, par->min, par->max,
+	    par->dyn_min_reason, par->dyn_max_reason))
+		return (-1);
 
-	return (-1);
+	MCF_ParamConf(MCF_MAXIMUM, "thread_pool_min",
+	    "%u", mgt_param.wthread_max);
+	return (0);
 }
 
 /*--------------------------------------------------------------------*/