From: Willy Tarreau <w@1wt.eu>
Date: Fri, 28 Jan 2022 08:10:52 +0000 (+0100)
Subject: BUILD: cpuset: do not use const on the source of CPU_AND/CPU_ASSIGN
X-Git-Tag: v2.6-dev1~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a65b4933bae485c7dd7de53c665d09954f92a9f9;p=thirdparty%2Fhaproxy.git

BUILD: cpuset: do not use const on the source of CPU_AND/CPU_ASSIGN

The man page indicates that CPU_AND() and CPU_ASSIGN() take a variable,
not a const on the source, even though it doesn't make much sense. But
with older libcs, this triggers a build warning:

  src/cpuset.c: In function 'ha_cpuset_and':
  src/cpuset.c:53: warning: initialization discards qualifiers from pointer target type
  src/cpuset.c: In function 'ha_cpuset_assign':
  src/cpuset.c:101: warning: initialization discards qualifiers from pointer target type

Better stick stricter to the documented API as this is really harmless
here. There's no need to backport it (unless build issues are reported,
which is quite unlikely).
---

diff --git a/include/haproxy/cpuset.h b/include/haproxy/cpuset.h
index 390115bcdb..c9226f113a 100644
--- a/include/haproxy/cpuset.h
+++ b/include/haproxy/cpuset.h
@@ -21,7 +21,7 @@ int ha_cpuset_clr(struct hap_cpuset *set, int cpu);
 
 /* Bitwise and equivalent operation between <src> and <dst> stored in <dst>.
  */
-void ha_cpuset_and(struct hap_cpuset *dst, const struct hap_cpuset *src);
+void ha_cpuset_and(struct hap_cpuset *dst, struct hap_cpuset *src);
 
 /* Returns the count of set index in <set>.
  */
@@ -35,7 +35,7 @@ int ha_cpuset_ffs(const struct hap_cpuset *set);
 
 /* Copy <src> set into <dst>.
  */
-void ha_cpuset_assign(struct hap_cpuset *dst, const struct hap_cpuset *src);
+void ha_cpuset_assign(struct hap_cpuset *dst, struct hap_cpuset *src);
 
 /* Returns the biggest index plus one usable on the platform.
  */
diff --git a/src/cpuset.c b/src/cpuset.c
index c1632c5e46..f7b66020ed 100644
--- a/src/cpuset.c
+++ b/src/cpuset.c
@@ -47,7 +47,7 @@ int ha_cpuset_clr(struct hap_cpuset *set, int cpu)
 #endif
 }
 
-void ha_cpuset_and(struct hap_cpuset *dst, const struct hap_cpuset *src)
+void ha_cpuset_and(struct hap_cpuset *dst, struct hap_cpuset *src)
 {
 #if defined(CPUSET_USE_CPUSET)
 	CPU_AND(&dst->cpuset, &dst->cpuset, &src->cpuset);
@@ -94,7 +94,7 @@ int ha_cpuset_ffs(const struct hap_cpuset *set)
 #endif
 }
 
-void ha_cpuset_assign(struct hap_cpuset *dst, const struct hap_cpuset *src)
+void ha_cpuset_assign(struct hap_cpuset *dst, struct hap_cpuset *src)
 {
 #if defined(CPUSET_USE_CPUSET)
 	CPU_ZERO(&dst->cpuset);