]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
SourceFormat Enforcement
authorSource Maintenance <squidadm@squid-cache.org>
Thu, 1 Dec 2016 00:12:03 +0000 (00:12 +0000)
committerSource Maintenance <squidadm@squid-cache.org>
Thu, 1 Dec 2016 00:12:03 +0000 (00:12 +0000)
src/acl/RegexData.cc

index 91314b48e702e41e309b8a3b82e58159cff6380c..6d1b26ff8b36802d7cedd2adc4d0494135a6351a 100644 (file)
@@ -21,8 +21,8 @@
 #include "base/RegexPattern.h"
 #include "ConfigParser.h"
 #include "Debug.h"
-#include "sbuf/List.h"
 #include "sbuf/Algorithms.h"
+#include "sbuf/List.h"
 
 ACLRegexData::~ACLRegexData()
 {
@@ -126,13 +126,13 @@ compileRE(std::list<RegexPattern> &curlist, const char * RE, int flags)
 static bool
 compileRE(std::list<RegexPattern> &curlist, const SBufList &RE, int flags)
 {
-       if (RE.empty())
-               return curlist.empty(); // XXX: old code did this. It looks wrong.
-       SBuf regexp;
-       static const SBuf openparen("("), closeparen(")"), separator(")|(");
-       JoinContainerIntoSBuf(regexp, RE.begin(), RE.end(), separator, openparen,
-                       closeparen);
-       return compileRE(curlist, regexp.c_str(), flags);
+    if (RE.empty())
+        return curlist.empty(); // XXX: old code did this. It looks wrong.
+    SBuf regexp;
+    static const SBuf openparen("("), closeparen(")"), separator(")|(");
+    JoinContainerIntoSBuf(regexp, RE.begin(), RE.end(), separator, openparen,
+                          closeparen);
+    return compileRE(curlist, regexp.c_str(), flags);
 }
 
 /** Compose and compile one large RE from a set of (small) REs.