event/BufferedSocket: pass std::span to OnSocketInput()

src/client/Client.hxx

@@ -258,7 +258,7 @@ private:
 	CommandResult ProcessLine(char *line) noexcept;
 
 	/* virtual methods from class BufferedSocket */
-	InputResult OnSocketInput(void *data, size_t length) noexcept override;
+	InputResult OnSocketInput(std::span<std::byte> src) noexcept override;
 	void OnSocketError(std::exception_ptr ep) noexcept override;
 	void OnSocketClosed() noexcept override;
 

src/client/Read.cxx

@@ -10,13 +10,13 @@
 #include <cstring>
 
 BufferedSocket::InputResult
-Client::OnSocketInput(void *data, size_t length) noexcept
+Client::OnSocketInput(std::span<std::byte> src) noexcept
 {
 	if (background_command)
 		return InputResult::PAUSE;
 
-	char *p = (char *)data;
+	char *p = (char *)src.data();
-	char *newline = (char *)std::memchr(p, '\n', length);
+	char *newline = (char *)std::memchr(p, '\n', src.size());
 	if (newline == nullptr)
 		return InputResult::MORE;
 

src/event/BufferedSocket.cxx

@@ -56,7 +56,7 @@ BufferedSocket::ResumeInput() noexcept
 			return true;
 		}
 
-		const auto result = OnSocketInput(buffer.data(), buffer.size());
+		const auto result = OnSocketInput(buffer);
 		switch (result) {
 		case InputResult::MORE:
 			if (input.IsFull()) {

src/event/BufferedSocket.hxx

@@ -109,11 +109,11 @@ protected:
 	/**
 	 * Data has been received on the socket.
 	 *
-	 * @param data a pointer to the beginning of the buffer; the
+	 * @param src the buffer containing the data; the
 	 * buffer may be modified by the method while it processes the
 	 * data
 	 */
-	virtual InputResult OnSocketInput(void *data, size_t length) noexcept = 0;
+	virtual InputResult OnSocketInput(std::span<std::byte> src) noexcept = 0;
 
 	virtual void OnSocketError(std::exception_ptr ep) noexcept = 0;
 	virtual void OnSocketClosed() noexcept = 0;

src/output/plugins/httpd/HttpdClient.cxx

@@ -385,7 +385,7 @@ HttpdClient::OnSocketReady(unsigned flags) noexcept
 }
 
 BufferedSocket::InputResult
-HttpdClient::OnSocketInput(void *data, size_t length) noexcept
+HttpdClient::OnSocketInput(std::span<std::byte> src) noexcept
 {
 	if (state == State::RESPONSE) {
 		LogWarning(httpd_output_domain,
@@ -394,8 +394,8 @@ HttpdClient::OnSocketInput(void *data, size_t length) noexcept
 		return InputResult::CLOSED;
 	}
 
-	char *line = (char *)data;
+	char *line = (char *)src.data();
-	char *newline = (char *)std::memchr(line, '\n', length);
+	char *newline = (char *)std::memchr(line, '\n', src.size());
 	if (newline == nullptr)
 		return InputResult::MORE;
 

src/output/plugins/httpd/HttpdClient.hxx

@@ -181,7 +181,7 @@ protected:
 	/* virtual methods from class BufferedSocket */
 	void OnSocketReady(unsigned flags) noexcept override;
 
-	InputResult OnSocketInput(void *data, size_t length) noexcept override;
+	InputResult OnSocketInput(std::span<std::byte> src) noexcept override;
 	void OnSocketError(std::exception_ptr ep) noexcept override;
 	void OnSocketClosed() noexcept override;
 };

src/output/plugins/snapcast/Client.cxx

@@ -245,12 +245,12 @@ SnapcastClient::SendStreamTags(std::span<const std::byte> payload) noexcept
 }
 
 BufferedSocket::InputResult
-SnapcastClient::OnSocketInput(void *data, size_t length) noexcept
+SnapcastClient::OnSocketInput(std::span<std::byte> src) noexcept
 {
-	auto &base = *(SnapcastBase *)data;
+	auto &base = *(SnapcastBase *)src.data();
 
-	if (length < sizeof(base) ||
+	if (src.size() < sizeof(base) ||
-	    length < sizeof(base) + base.size)
+	    src.size() < sizeof(base) + base.size)
 		return InputResult::MORE;
 
 	base.received = ToSnapcastTimestamp(GetEventLoop().SteadyNow());

src/output/plugins/snapcast/Client.hxx

@@ -79,7 +79,7 @@ private:
 
 	/* virtual methods from class BufferedSocket */
 	void OnSocketReady(unsigned flags) noexcept override;
-	InputResult OnSocketInput(void *data, size_t length) noexcept override;
+	InputResult OnSocketInput(std::span<std::byte> src) noexcept override;
 	void OnSocketError(std::exception_ptr ep) noexcept override;
 	void OnSocketClosed() noexcept override;
 };