From: Willy Tarreau <w@1wt.eu>
Date: Mon, 15 Oct 2018 07:37:03 +0000 (+0200)
Subject: MINOR: config: use atleast2() instead of my_popcountl() where relevant
X-Git-Tag: v1.9-dev4~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9504dd64c6a92de1c20f6a53fb25c4e27ba6683d;p=thirdparty%2Fhaproxy.git

MINOR: config: use atleast2() instead of my_popcountl() where relevant

Quite often we used my_popcountl() just to check for > 1 bit set. Now
we have an easier solution, let's use it.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 5a6b705ef4..4e577aa0b2 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -1664,7 +1664,7 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm)
 			}
 			*slash = '/';
 
-			if (autoinc && my_popcountl(proc) != 1 && my_popcountl(thread) != 1) {
+			if (autoinc && atleast2(proc) && atleast2(thread)) {
 				ha_alert("parsing [%s:%d] : %s : '%s' : unable to automatically bind "
 					 "a process range _AND_ a thread range\n",
 					 file, linenum, args[0], args[1]);
@@ -8824,7 +8824,7 @@ out_uri_auth_compat:
 				mask &= bind_conf->bind_proc;
 
 			/* stop here if more than one process is used */
-			if (my_popcountl(mask) > 1)
+			if (atleast2(mask))
 				break;
 		}
 		if (&bind_conf->by_fe != &global.stats_fe->conf.bind) {
@@ -8973,7 +8973,7 @@ out_uri_auth_compat:
 				bind_conf->xprt->destroy_bind_conf(bind_conf);
 		}
 
-		if (my_popcountl(curproxy->bind_proc & nbits(global.nbproc)) > 1) {
+		if (atleast2(curproxy->bind_proc & nbits(global.nbproc))) {
 			if (curproxy->uri_auth) {
 				int count, maxproc = 0;
 
@@ -9072,7 +9072,7 @@ out_uri_auth_compat:
 				ha_warning("Removing incomplete section 'peers %s' (no peer named '%s').\n",
 					   curpeers->id, localpeer);
 			}
-			else if (my_popcountl(curpeers->peers_fe->bind_proc) != 1) {
+			else if (atleast2(curpeers->peers_fe->bind_proc)) {
 				/* either it's totally stopped or too much used */
 				if (curpeers->peers_fe->bind_proc) {
 					ha_alert("Peers section '%s': peers referenced by sections "