From a7d41a99a171e033f0e096a1f50922186a0f61bd Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Fri, 8 Nov 2024 19:43:47 +0100
Subject: [PATCH] util/ForeignFifoBuffer: pass std::span to constructor

---
 src/util/DynamicFifoBuffer.hxx |  4 ++--
 src/util/ForeignFifoBuffer.hxx | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/util/DynamicFifoBuffer.hxx b/src/util/DynamicFifoBuffer.hxx
index e8a45d6b2..e26f53a3c 100644
--- a/src/util/DynamicFifoBuffer.hxx
+++ b/src/util/DynamicFifoBuffer.hxx
@@ -28,7 +28,7 @@ public:
 	 * Allocate a buffer with the given capacity.
 	 */
 	explicit DynamicFifoBuffer(size_type _capacity) noexcept
-		:ForeignFifoBuffer<T>(new T[_capacity], _capacity) {}
+		:ForeignFifoBuffer<T>(std::span{new T[_capacity], _capacity}) {}
 
 	~DynamicFifoBuffer() noexcept {
 		delete[] GetBuffer();
@@ -51,7 +51,7 @@ public:
 
 		T *old_data = GetBuffer();
 		T *new_data = new T[new_capacity];
-		ForeignFifoBuffer<T>::MoveBuffer(new_data, new_capacity);
+		ForeignFifoBuffer<T>::MoveBuffer({new_data, new_capacity});
 		delete[] old_data;
 	}
 
diff --git a/src/util/ForeignFifoBuffer.hxx b/src/util/ForeignFifoBuffer.hxx
index 99cc9d777..691a67940 100644
--- a/src/util/ForeignFifoBuffer.hxx
+++ b/src/util/ForeignFifoBuffer.hxx
@@ -34,8 +34,8 @@ public:
 	explicit constexpr ForeignFifoBuffer(std::nullptr_t) noexcept
 		:buffer() {}
 
-	constexpr ForeignFifoBuffer(T *_data, size_type _capacity) noexcept
-		:buffer(_data, _capacity) {}
+	explicit constexpr ForeignFifoBuffer(Range _buffer) noexcept
+		:buffer(_buffer) {}
 
 	constexpr ForeignFifoBuffer(ForeignFifoBuffer &&src) noexcept
 		:buffer(src.buffer), head(src.head), tail(src.tail) {
@@ -83,20 +83,20 @@ public:
 		head = tail = 0;
 	}
 
-	void SetBuffer(T *_data, size_type _capacity) noexcept {
-		assert(_data != nullptr);
-		assert(_capacity > 0);
+	void SetBuffer(Range _buffer) noexcept {
+		assert(_buffer.data() != nullptr);
+		assert(!_buffer.empty());
 
-		buffer = {_data, _capacity};
+		buffer = _buffer;
 		head = tail = 0;
 	}
 
-	void MoveBuffer(T *new_data, size_type new_capacity) noexcept {
+	void MoveBuffer(Range _buffer) noexcept {
 		const auto r = Read();
-		assert(new_capacity >= r.size());
-		std::move(r.begin(), r.end(), new_data);
+		assert(_buffer.size() >= r.size());
+		std::move(r.begin(), r.end(), _buffer.begin());
 
-		buffer = {new_data, new_capacity};
+		buffer = _buffer;
 		tail -= head;
 		head = 0;
 	}