SourceFormat Enforcement

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

diff --git a/src/acl/UserData.cc b/src/acl/UserData.cc
index 93f4c348a0769deb757bac5b3a1311f4463f08dc..7b66a43c2f4a683acfd76d0e2182cf39a0339dd6 100644 (file)
--- a/src/acl/UserData.cc
+++ b/src/acl/UserData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -14,7 +14,7 @@
 #include "ConfigParser.h"
 #include "Debug.h"
 #include "globals.h"
-#include "SBufAlgos.h"
+#include "sbuf/Algorithms.h"
 #include "util.h"
 
 bool
@@ -50,24 +50,29 @@ ACLUserData::dump() const
 
     sl.insert(sl.end(), userDataNames.begin(), userDataNames.end());
 
-    debugs(28,5, "ACLUserData dump output: " << SBufContainerJoin(userDataNames,SBuf(" ")));
+    debugs(28,5, "ACLUserData dump output: " <<
+           JoinContainerToSBuf(userDataNames.begin(), userDataNames.end(),
+                               SBuf(" ")));
     return sl;
 }
 
 static bool
-CaseInsensitveSBufCompare(const SBuf &lhs, const SBuf &rhs)
+CaseSensitiveSBufCompare(const SBuf &lhs, const SBuf &rhs)
 {
-    return (lhs.caseCmp(rhs) < 0);
+    return (lhs.cmp(rhs) < 0);
 }
 
 static bool
-CaseSensitveSBufCompare(const SBuf &lhs, const SBuf &rhs)
+CaseInsensitveSBufCompare(const SBuf &lhs, const SBuf &rhs)
 {
-    return (lhs < rhs);
+    return (lhs.caseCmp(rhs) < 0);
 }
 
-ACLUserData::ACLUserData() : userDataNames(CaseSensitveSBufCompare)
+ACLUserData::ACLUserData() :
+    userDataNames(CaseSensitiveSBufCompare)
 {
+    flags.case_insensitive = false;
+    flags.required = false;
 }
 
 void