Clarified some comments in HttpHeaderFieldStat

Sorted class forward declarations in HTtpHeaderTools
Fixed debug in RequestFlags.cc
Properly indented constructor in RequestFlags.h
class-ified AclAddress

diff --git a/src/HttpHeaderFieldInfo.h b/src/HttpHeaderFieldInfo.h
index 34f2a1fc613daa3229191fe2d13e18334045c663..4634f8c8ebc58d2d2233fb54bf982888e41af04a 100644 (file)
--- a/src/HttpHeaderFieldInfo.h
+++ b/src/HttpHeaderFieldInfo.h
@@ -36,7 +36,7 @@
 class HttpHeaderFieldInfo
 {
 public:
-    HttpHeaderFieldInfo() : id (HDR_ACCEPT), type (ftInvalid) {}
+    HttpHeaderFieldInfo() : id(HDR_ACCEPT), type(ftInvalid) {}
 
     http_hdr_type id;
     String name;

diff --git a/src/HttpHeaderFieldStat.h b/src/HttpHeaderFieldStat.h
index 026dffb513a9f078638353ea6b772a5ea21ce339..805255a617fe79ccfb5c3ec4374064dd72a9fdb7 100644 (file)
--- a/src/HttpHeaderFieldStat.h
+++ b/src/HttpHeaderFieldStat.h
@@ -36,10 +36,10 @@ public:
     HttpHeaderFieldStat() : aliveCount(0), seenCount(0), parsCount(0), errCount(0), repCount(0) {}
 
     int aliveCount;     /* created but not destroyed (count) */
-    int seenCount;      /* #fields we've seen */
-    int parsCount;      /* #parsing attempts */
-    int errCount;       /* #pasring errors */
-    int repCount;       /* #repetitons */
+    int seenCount;      /* number of fields we've seen */
+    int parsCount;      /* number of parsing attempts */
+    int errCount;       /* number of pasring errors */
+    int repCount;       /* number of repetitons */
 };
 
 #endif /* SQUID_HTTPHEADERFIELDSTAT_H_ */

diff --git a/src/HttpHeaderTools.h b/src/HttpHeaderTools.h
index e95d6557839374e75400d8da4ec285a8c022ffd9..781a7e471124adc04a24015185a96796ef11666b 100644 (file)
--- a/src/HttpHeaderTools.h
+++ b/src/HttpHeaderTools.h
@@ -95,10 +95,10 @@ public:
 
 extern int httpHeaderParseOffset(const char *start, int64_t * off);
 
-class String;
 class HttpHeader;
-class HttpRequest;
 class HttpHeaderFieldInfo;
+class HttpRequest;
+class String;
 
 extern HttpHeaderFieldInfo *httpHeaderBuildFieldsInfo(const HttpHeaderFieldAttrs * attrs, int count);
 extern void httpHeaderDestroyFieldsInfo(HttpHeaderFieldInfo * info, int count);

diff --git a/src/RequestFlags.cc b/src/RequestFlags.cc
index 5e0182b02f41f22e066fb6f4612dc1c0e8520da0..51dee30b1f9d9fe14b70d1eff0c159278ca99046 100644 (file)
--- a/src/RequestFlags.cc
+++ b/src/RequestFlags.cc
@@ -45,14 +45,14 @@ RequestFlags::resetTCP() const
 void
 RequestFlags::setResetTCP()
 {
-    debugs(73, 9, "request_flags::setResetTCP");
+    debugs(73, 9, HERE);
     resetTCP_ = true;
 }
 
 void
 RequestFlags::clearResetTCP()
 {
-    debugs(73, 9, "request_flags::clearResetTCP");
+    debugs(73, 9, HERE);
     resetTCP_ = false;
 }
 

diff --git a/src/RequestFlags.h b/src/RequestFlags.h
index 6d00b2056e10a7de885318632141219f0dfe0d94..612bffea5575a3530cd12f749a355c735b25ae2e 100644 (file)
--- a/src/RequestFlags.h
+++ b/src/RequestFlags.h
@@ -37,13 +37,16 @@ class RequestFlags
 public:
     RequestFlags():
         nocache(false), ims(false), auth_(false), cachable(false),
-        hierarchical_(false), loopdetect(false), proxy_keepalive(false), proxying_(false),
-        refresh_(false), redirected(false), need_validation(false),
-        fail_on_validation_err(false), stale_if_hit(false), nocache_hack(false), accelerated_(false),
-        ignore_cc(false), intercepted_(false), hostVerified_(false), spoof_client_ip(false),
-        internal(false), internalclient(false), must_keepalive(false), connection_auth_wanted(false), connection_auth_disabled(false), connection_proxy_auth(false), pinned_(false),
-        canRePin_(false), authSent_(false), noDirect_(false), chunkedReply_(false),
-        streamError_(false), sslPeek_(false),
+        hierarchical_(false), loopdetect(false), proxy_keepalive(false),
+        proxying_(false), refresh_(false), redirected(false),
+        need_validation(false), fail_on_validation_err(false),
+        stale_if_hit(false), nocache_hack(false), accelerated_(false),
+        ignore_cc(false), intercepted_(false), hostVerified_(false),
+        spoof_client_ip(false), internal(false), internalclient(false),
+        must_keepalive(false), connection_auth_wanted(false),
+        connection_auth_disabled(false), connection_proxy_auth(false),
+        pinned_(false), canRePin_(false), authSent_(false), noDirect_(false),
+        chunkedReply_(false), streamError_(false), sslPeek_(false),
         doneFollowXForwardedFor(!FOLLOW_X_FORWARDED_FOR),
         sslBumped_(false), destinationIPLookedUp_(false), resetTCP_(false),
         isRanged_(false)

diff --git a/src/acl/AclAddress.h b/src/acl/AclAddress.h
index 2f598b6b20619d346f705c1aa4f1ae08c468a2bd..3fd848fb5d0311fdcae270f497fecc9ab2dd0e01 100644 (file)
--- a/src/acl/AclAddress.h
+++ b/src/acl/AclAddress.h
@@ -32,7 +32,9 @@
 #include "ip/Address.h"
 #include "acl/Acl.h"
 
-struct AclAddress {
+class AclAddress
+{
+public:
     AclAddress *next;
     ACLList *aclList;