From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 17 Dec 2012 02:19:47 +0000 (+1300)
Subject: Fix typos in AccessLogEntry
X-Git-Tag: SQUID_3_4_0_1~432
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5d0906ae5df413d820d7d0d43ca3a5d659e554f;p=thirdparty%2Fsquid.git

Fix typos in AccessLogEntry

Some of these were added by rev.12527 patch.

Clash between USE_ICAP_CLIENT and USE_ADAPTATION uncovered while testing
the fix for the those issues. Breaks build for eCAP without ICAP.
---

diff --git a/src/AccessLogEntry.cc b/src/AccessLogEntry.cc
index 8fdc201072..25484c7a54 100644
--- a/src/AccessLogEntry.cc
+++ b/src/AccessLogEntry.cc
@@ -31,7 +31,7 @@ AccessLogEntry::~AccessLogEntry()
 {
     safe_free(headers.request);
 
-#if ICAP_CLIENT
+#if USE_ADAPTATION
     safe_free(adapt.last_meta);
 #endif
 
diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index c84744fe39..4c23518e58 100644
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -243,10 +243,10 @@ public:
     class IcapLogEntry
     {
     public:
-        IcapLogEntry() : reqMethod(methodNone), bytesSent(0), bytesRead(0),
+        IcapLogEntry() : reqMethod(Adaptation::methodNone), bytesSent(0), bytesRead(0),
                 bodyBytesRead(-1), request(NULL), reply(NULL),
                 outcome(Adaptation::Icap::xoUnknown), trTime(0),
-                ioTime(0), processingTime(0), resStatus(HTTP_STATUS_NONE) {}
+                ioTime(0), resStatus(HTTP_STATUS_NONE), processingTime(0) {}
 
         Ip::Address hostAddr; ///< ICAP server IP address
         String serviceName;        ///< ICAP service name