From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 20 Jun 2025 22:02:48 +0000 (+0900)
Subject: cpu-set-util: rename cpu_set_add_all() and cpu_mask_add_all()
X-Git-Tag: v258-rc1~238^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4093f43fb14e81b83bbc9fbed015b293a8362cc;p=thirdparty%2Fsystemd.git

cpu-set-util: rename cpu_set_add_all() and cpu_mask_add_all()

This renames
- cpu_set_add_all() -> cpu_set_add_set(),
- cpu_mask_add_all() -> cpu_set_add_all().

No functional change, just refactoring.
---

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index c0915f501a1..e277849948a 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -2901,9 +2901,9 @@ int bus_exec_context_set_transient_property(
                                         return -ENOMEM;
 
                                 /* We forego any optimizations here, and always create the structure using
-                                 * cpu_set_add_all(), because we don't want to care if the existing size we
+                                 * cpu_set_add_set(), because we don't want to care if the existing size we
                                  * got over dbus is appropriate. */
-                                r = cpu_set_add_all(affinity ? &c->cpu_set : &c->numa_policy.nodes, &set);
+                                r = cpu_set_add_set(affinity ? &c->cpu_set : &c->numa_policy.nodes, &set);
                                 if (r < 0)
                                         return r;
 
diff --git a/src/shared/cpu-set-util.c b/src/shared/cpu-set-util.c
index b7be99bbb60..8bad1e8741a 100644
--- a/src/shared/cpu-set-util.c
+++ b/src/shared/cpu-set-util.c
@@ -159,7 +159,7 @@ int cpu_set_add(CPUSet *c, size_t i) {
         return 0;
 }
 
-int cpu_set_add_all(CPUSet *c, const CPUSet *src) {
+int cpu_set_add_set(CPUSet *c, const CPUSet *src) {
         int r;
 
         assert(c);
@@ -196,7 +196,7 @@ static int cpu_set_add_range(CPUSet *c, size_t start, size_t end) {
         return 0;
 }
 
-int cpu_mask_add_all(CPUSet *c) {
+int cpu_set_add_all(CPUSet *c) {
         assert(c);
 
         long m = sysconf(_SC_NPROCESSORS_ONLN);
@@ -292,7 +292,7 @@ int parse_cpu_set_extend(
                 return 1;
         }
 
-        return cpu_set_add_all(old, &cpuset);
+        return cpu_set_add_set(old, &cpuset);
 }
 
 int cpus_in_affinity_mask(void) {
diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h
index 610a2b2c776..50535fdc2f3 100644
--- a/src/shared/cpu-set-util.h
+++ b/src/shared/cpu-set-util.h
@@ -23,8 +23,8 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(CPUSet*, cpu_set_free);
 
 int cpu_set_realloc(CPUSet *c, size_t n);
 int cpu_set_add(CPUSet *c, size_t i);
-int cpu_set_add_all(CPUSet *c, const CPUSet *src);
-int cpu_mask_add_all(CPUSet *c);
+int cpu_set_add_set(CPUSet *c, const CPUSet *src);
+int cpu_set_add_all(CPUSet *c);
 
 char* cpu_set_to_string(const CPUSet *c);
 char* cpu_set_to_range_string(const CPUSet *c);
diff --git a/src/shared/numa-util.c b/src/shared/numa-util.c
index 88f02bc5595..c06ad985d8c 100644
--- a/src/shared/numa-util.c
+++ b/src/shared/numa-util.c
@@ -116,7 +116,7 @@ int numa_to_cpu_set(const NUMAPolicy *policy, CPUSet *ret) {
                 if (r < 0)
                         return r;
 
-                r = cpu_set_add_all(&s, &part);
+                r = cpu_set_add_set(&s, &part);
                 if (r < 0)
                         return r;
         }
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 831575666d1..b10e48a4ae7 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -1396,7 +1396,7 @@ int config_parse_rps_cpu_mask(
                 cpu_set_reset(mask);
 
         else if (streq(rvalue, "all")) {
-                r = cpu_mask_add_all(mask);
+                r = cpu_set_add_all(mask);
                 if (r < 0) {
                         log_syntax(unit, LOG_WARNING, filename, line, r,
                                    "Failed to create CPU affinity mask representing \"all\" cpus, ignoring: %m");