From a65b4933bae485c7dd7de53c665d09954f92a9f9 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 28 Jan 2022 09:10:52 +0100 Subject: [PATCH] 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). --- include/haproxy/cpuset.h | 4 ++-- src/cpuset.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/haproxy/cpuset.h b/include/haproxy/cpuset.h index 390115bcd..c9226f113 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 and stored in . */ -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 . */ @@ -35,7 +35,7 @@ int ha_cpuset_ffs(const struct hap_cpuset *set); /* Copy set into . */ -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 c1632c5e4..f7b66020e 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);