From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Tue, 14 May 2013 18:26:49 +0000 (-0600)
Subject: Polishing to address squid-dev review comments.
X-Git-Tag: SQUID_3_4_0_1~102^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=115b045f505521678ee6907ff387415044076a46;p=thirdparty%2Fsquid.git

Polishing to address squid-dev review comments.
---

diff --git a/src/acl/BoolOps.h b/src/acl/BoolOps.h
index b8a9a69c90..316295a0d6 100644
--- a/src/acl/BoolOps.h
+++ b/src/acl/BoolOps.h
@@ -32,7 +32,7 @@ MEMPROXY_CLASS_INLINE(Acl::NotNode);
 
 /// An inner ACL expression tree node representing a boolean conjuction (AND)
 /// operator applied to a list of child tree nodes.
-/// For example, conditions expressed on a single http_access line are ORed.
+/// For example, conditions expressed on a single http_access line are ANDed.
 class AndNode: public InnerNode
 {
 public:
diff --git a/src/acl/Checklist.cc b/src/acl/Checklist.cc
index a4cec177f8..279b452a51 100644
--- a/src/acl/Checklist.cc
+++ b/src/acl/Checklist.cc
@@ -81,7 +81,7 @@ ACLChecklist::matchChild(const Acl::InnerNode *current, Acl::Nodes::const_iterat
 {
     assert(current && child);
 
-    // Remember the curernt tree location to prevent "async loop" cases where
+    // Remember the current tree location to prevent "async loop" cases where
     // the same child node wants to go async more than once.
     matchLoc_ = Breadcrumb(current, pos);
 
diff --git a/src/acl/Makefile.am b/src/acl/Makefile.am
index 71d2b12fcb..5b0b778926 100644
--- a/src/acl/Makefile.am
+++ b/src/acl/Makefile.am
@@ -7,13 +7,13 @@ noinst_LTLIBRARIES = libapi.la libstate.la libacls.la
 libapi_la_SOURCES = \
 	Acl.cc \
 	Acl.h \
+	BoolOps.cc \
+	BoolOps.h \
 	Checklist.cc \
 	Checklist.h \
 	forward.h \
 	InnerNode.cc \
 	InnerNode.h \
-	BoolOps.cc \
-	BoolOps.h \
 	Tree.cc \
 	Tree.h
 
@@ -41,12 +41,12 @@ libacls_la_SOURCES = \
 	Time.h \
 	TimeData.cc \
 	TimeData.h \
-	Asn.cc \
-	Asn.h \
 	AllOf.cc \
 	AllOf.h \
 	AnyOf.cc \
 	AnyOf.h \
+	Asn.cc \
+	Asn.h \
 	Browser.cc \
 	Browser.h \
 	DestinationAsn.h \
diff --git a/src/acl/Tree.cc b/src/acl/Tree.cc
index 552948f663..79bd58d808 100644
--- a/src/acl/Tree.cc
+++ b/src/acl/Tree.cc
@@ -61,7 +61,7 @@ Acl::Tree::treeDump(const char *prefix, const ActionToString &convert) const
 
         if (action != actions.end()) {
             const char *act = convert ? convert[action->kind] :
-                (*action == ACCESS_ALLOWED ? "Allow" : "Deny");
+                (*action == ACCESS_ALLOWED ? "allow" : "deny");
             wordlistAdd(&text, act ? act : "???");
             ++action;
         }