From c7690513cdf317f9221cedf4892facdd100ef74d Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 10 Nov 2020 22:23:26 +0000
Subject: Convert FIRST_MOD_RESULT_CUSTOM to a variadic function.

---
 src/modules/m_httpd.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/modules/m_httpd.cpp')

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 2ca76af2a..42183447a 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -292,17 +292,16 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 
 	void ServeData()
 	{
-		ModResult MOD_RESULT;
 		std::string method = http_method_str(static_cast<http_method>(parser.method));
 		HTTPRequestURI parsed;
 		ParseURI(uri, parsed);
 		HTTPRequest acl(method, parsed, &headers, this, ip, body);
-		FIRST_MOD_RESULT_CUSTOM(*aclevprov, HTTPACLEventListener, OnHTTPACLCheck, MOD_RESULT, (acl));
-		if (MOD_RESULT != MOD_RES_DENY)
+		ModResult res = aclevprov->FirstResult(&HTTPACLEventListener::OnHTTPACLCheck, acl);
+		if (res != MOD_RES_DENY)
 		{
 			HTTPRequest request(method, parsed, &headers, this, ip, body);
-			FIRST_MOD_RESULT_CUSTOM(*reqevprov, HTTPRequestEventListener, OnHTTPRequest, MOD_RESULT, (request));
-			if (MOD_RESULT == MOD_RES_PASSTHRU)
+			res = reqevprov->FirstResult(&HTTPRequestEventListener::OnHTTPRequest, request);
+			if (res == MOD_RES_PASSTHRU)
 			{
 				SendHTTPError(404);
 			}
-- 
cgit v1.3.1-10-gc9f91