From 4d9ee309c525c4b8690fb5b1e459f426b77d706c Mon Sep 17 00:00:00 2001
From: Max Kellermann <mk@cm4all.com>
Date: Mon, 11 Dec 2023 16:26:07 +0100
Subject: [PATCH] spawn/ResourceLimits: use std::array

---
 src/spawn/ResourceLimits.cxx | 4 ++--
 src/spawn/ResourceLimits.hxx | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/spawn/ResourceLimits.cxx b/src/spawn/ResourceLimits.cxx
index 50662831c..fb682fdcc 100644
--- 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
index 316ccf950..4871002e6 100644
--- 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;