From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Fri, 29 Jan 2010 01:13:09 +0000 (-0700)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_2_0_1~445
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=105d1937cfe0fcd4b547ebdd495506d5e568c2d0;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index 5f2ee2225f..23be3c27c0 100644
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -48,8 +48,7 @@ class AccessLogEntry
 
 public:
     AccessLogEntry() : url(NULL) , reply(NULL), request(NULL),
-	adapted_request(NULL)
-    {}
+            adapted_request(NULL) {}
 
     const char *url;
 
@@ -136,7 +135,7 @@ public:
 
     public:
         Headers() : request(NULL),
-	    adapted_request(NULL),
+                adapted_request(NULL),
 
 #if ICAP_CLIENT
                 icap(NULL),
@@ -145,7 +144,7 @@ public:
 
         char *request; //< virgin HTTP request headers
 
-	char *adapted_request; //< HTTP request headers after adaptation and redirection
+        char *adapted_request; //< HTTP request headers after adaptation and redirection
 
 
 #if ICAP_CLIENT
@@ -166,7 +165,7 @@ public:
     } _private;
     HierarchyLogEntry hier;
     HttpReply *reply;
-    HttpRequest *request; //< virgin HTTP request 
+    HttpRequest *request; //< virgin HTTP request
     HttpRequest *adapted_request; //< HTTP request after adaptation and redirection
 
 
diff --git a/src/client_side.cc b/src/client_side.cc
index 7f362cf848..47d5b50600 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -461,17 +461,17 @@ prepareLogWithRequestDetails(HttpRequest * request, AccessLogEntry * aLogEntry)
         mb.init();
         packerToMemInit(&p, &mb);
         request->header.packInto(&p);
-	//This is the request after adaptation or redirection
-	aLogEntry->headers.adapted_request = xstrdup(mb.buf);
-
-	// the virgin request is saved to aLogEntry->request
-	if (aLogEntry->request) {
-	    packerClean(&p);
-	    mb.reset();
-	    packerToMemInit(&p, &mb);
-	    aLogEntry->request->header.packInto(&p);
-	    aLogEntry->headers.request = xstrdup(mb.buf);
-	}
+        //This is the request after adaptation or redirection
+        aLogEntry->headers.adapted_request = xstrdup(mb.buf);
+
+        // the virgin request is saved to aLogEntry->request
+        if (aLogEntry->request) {
+            packerClean(&p);
+            mb.reset();
+            packerToMemInit(&p, &mb);
+            aLogEntry->request->header.packInto(&p);
+            aLogEntry->headers.request = xstrdup(mb.buf);
+        }
 
 #if ICAP_CLIENT
         packerClean(&p);
diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 540ee82c59..2cb7d92bb6 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1258,7 +1258,7 @@ ClientHttpRequest::doCallouts()
 
     /*Save the original request for logging purposes*/
     if (!calloutContext->http->al.request)
-	calloutContext->http->al.request = HTTPMSGLOCK(request);
+        calloutContext->http->al.request = HTTPMSGLOCK(request);
 
     if (!calloutContext->http_access_done) {
         debugs(83, 3, HERE << "Doing calloutContext->clientAccessCheck()");