Source Format Enforcement (#1234)

[thirdparty/squid.git] / src / acl / SquidError.cc

diff --git a/src/acl/SquidError.cc b/src/acl/SquidError.cc
index 4dff3216dd37ff37f3c1a94be7fc3dd9d86d164b..efbfd8d091399ae8a9a42c6ff9afe8e7bdf3870c 100644 (file)
--- a/src/acl/SquidError.cc
+++ b/src/acl/SquidError.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2023 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -7,24 +7,17 @@
  */
 
 #include "squid.h"
-#include "acl/Checklist.h"
+#include "acl/FilledChecklist.h"
 #include "acl/SquidError.h"
 #include "HttpRequest.h"
 
 int
-ACLSquidErrorStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist, ACLFlags &)
+ACLSquidErrorStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist)
 {
     if (checklist->requestErrorType != ERR_MAX)
         return data->match(checklist->requestErrorType);
     else if (checklist->request)
-        return data->match(checklist->request->errType);
+        return data->match(checklist->request->error.category);
     return 0;
 }
 
-ACLSquidErrorStrategy *
-ACLSquidErrorStrategy::Instance()
-{
-    return &Instance_;
-}
-
-ACLSquidErrorStrategy ACLSquidErrorStrategy::Instance_;