------------------------------------------------------------
revno: 12215
revision-id: squidadm@squid-cache.org-20120718001218-3wv70xq8vyogosl3
parent: chtsanti@users.sourceforge.net-20120717142917-7bcbb9zqf5v85hhx
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Tue 2012-07-17 18:12:18 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20120718001218-\
#   3wv70xq8vyogosl3
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 4a5ff9e1305ce85b32de41aa716555e2323be75e
# timestamp: 2012-07-18 00:52:39 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: chtsanti@users.sourceforge.net-20120717142917-\
#   7bcbb9zqf5v85hhx
# 
# Begin patch
=== modified file 'src/AccessLogEntry.h'
--- src/AccessLogEntry.h	2012-07-17 14:25:06 +0000
+++ src/AccessLogEntry.h	2012-07-18 00:12:18 +0000
@@ -142,8 +142,8 @@
 #if USE_SSL
                 ssluser(NULL),
 #endif
-                port(NULL)
-        {;
+                port(NULL) {
+            ;
         }
 
         Ip::Address caddr;

=== modified file 'src/HttpHeaderTools.cc'
--- src/HttpHeaderTools.cc	2012-07-17 14:25:06 +0000
+++ src/HttpHeaderTools.cc	2012-07-18 00:12:18 +0000
@@ -649,8 +649,8 @@
             if (!fieldValue || fieldValue[0] == '\0')
                 fieldValue = "-";
 
-            HttpHeaderEntry *e = new HttpHeaderEntry(hwa->fieldId, hwa->fieldName.c_str(), 
-                                                     fieldValue);
+            HttpHeaderEntry *e = new HttpHeaderEntry(hwa->fieldId, hwa->fieldName.c_str(),
+                    fieldValue);
             heads->addEntry(e);
         }
     }

=== modified file 'src/HttpRequest.h'
--- src/HttpRequest.h	2012-07-17 14:25:06 +0000
+++ src/HttpRequest.h	2012-07-18 00:12:18 +0000
@@ -242,7 +242,7 @@
     CbcPointer<ConnStateData> clientConnectionManager;
 
     /**
-     * The AccessLogEntry for the current ClientHttpRequest/Server HttpRequest 
+     * The AccessLogEntry for the current ClientHttpRequest/Server HttpRequest
      * pair, if known;
      */
     AccessLogEntryPointer al;