Polishing to address squid-dev review comments.

diff --git a/src/acl/BoolOps.h b/src/acl/BoolOps.h
index b8a9a69c907f03658ad748848089f76e0343dfbc..316295a0d6ffc091383e735bebf59737c90e50cb 100644 (file)
--- 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 a4cec177f89e2e36cdf47f9e503c8374105e5f45..279b452a5165fd4130e9121d70c4329883a7dcb3 100644 (file)
--- 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 71d2b12fcb755d51c3fea3b49970f7ca915668e7..5b0b7789265a7cf1722e17a3eb1d8b445cefa4db 100644 (file)
--- 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 552948f66314690da197ad3757ad8cff48907e9c..79bd58d80861fb1c6ba974f5e47b1924593cb4fc 100644 (file)
--- 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;
         }