spawn/ResourceLimits: use std::array

CM4all · Dec 11, 2023 · 4d9ee30 · 4d9ee30
1 parent e4f6424
commit 4d9ee30
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/spawn/ResourceLimits.cxx b/src/spawn/ResourceLimits.cxx
@@ -120,7 +120,7 @@ rlimit_apply(int pid, int resource, const ResourceLimit &r)
 void
 ResourceLimits::Apply(int pid) const
 {
-	for (unsigned i = 0; i < RLIM_NLIMITS; ++i)
+	for (unsigned i = 0; i < values.size(); ++i)
 		rlimit_apply(pid, i, values[i]);
 }
 
@@ -222,7 +222,7 @@ ResourceLimits::Parse(const char *s) noexcept
 			return false;
 		}
 
-		assert(resource < RLIM_NLIMITS);
+		assert(resource < values.size());
 		struct rlimit *const t = &values[resource];
 
 		unsigned long value;

diff --git a/src/spawn/ResourceLimits.hxx b/src/spawn/ResourceLimits.hxx
@@ -6,6 +6,7 @@
 
 #include <sys/resource.h>
 
+#include <array>
 #include <cstddef>
 
 struct ResourceLimit : rlimit {
@@ -44,7 +45,7 @@ struct ResourceLimit : rlimit {
  * Resource limits.
  */
 struct ResourceLimits {
-	ResourceLimit values[RLIM_NLIMITS];
+	std::array<ResourceLimit, RLIM_NLIMITS> values;
 
 	[[gnu::pure]]
 	bool IsEmpty() const noexcept;