------------------------------------------------------------
revno: 10794
revision-id: squidadm@squid-cache.org-20100825001425-cmnlhmz1v0rsow8y
parent: rousskov@measurement-factory.com-20100824220552-l39amlnksfkaq0e2
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Tue 2010-08-24 18:14:25 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20100825001425-\
#   cmnlhmz1v0rsow8y
# target_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: c9135cee92efd7c46e1b4ffd14bfea200d87989d
# timestamp: 2010-08-25 00:53:32 +0000
# source_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: rousskov@measurement-factory.com-20100824220552-\
#   l39amlnksfkaq0e2
# 
# Begin patch
=== modified file 'src/HttpHeader.h'
--- src/HttpHeader.h	2010-08-24 04:18:51 +0000
+++ src/HttpHeader.h	2010-08-25 00:14:25 +0000
@@ -284,7 +284,7 @@
 HttpHeader::chunked() const
 {
     return has(HDR_TRANSFER_ENCODING) &&
-               hasListMember(HDR_TRANSFER_ENCODING, "chunked", ',');
+           hasListMember(HDR_TRANSFER_ENCODING, "chunked", ',');
 }
 
 #endif /* SQUID_HTTPHEADER_H */

=== modified file 'src/cache_cf.cc'
--- src/cache_cf.cc	2010-08-24 11:31:44 +0000
+++ src/cache_cf.cc	2010-08-25 00:14:25 +0000
@@ -1917,7 +1917,7 @@
             char *mode, *nextmode;
             for (mode = nextmode = tmp; mode; mode = nextmode) {
                 nextmode = strchr(mode, ',');
-		debugs(0,0,"HTCP mode '" << mode << "' next=" << nextmode);
+                debugs(0,0,"HTCP mode '" << mode << "' next=" << nextmode);
                 if (nextmode)
                     *nextmode++ = '\0';
                 if (!strcasecmp(mode, "no-clr")) {

=== modified file 'src/disk.cc'
--- src/disk.cc	2010-08-24 10:35:03 +0000
+++ src/disk.cc	2010-08-25 00:14:25 +0000
@@ -57,7 +57,7 @@
 /* hack needed on SunStudio to avoid linkage convention mismatch */
 static void cxx_xfree(void *ptr)
 {
-  xfree(ptr);
+    xfree(ptr);
 }
 
 /*

=== modified file 'src/mem.cc'
--- src/mem.cc	2010-08-24 10:35:03 +0000
+++ src/mem.cc	2010-08-25 00:14:25 +0000
@@ -546,7 +546,7 @@
 static void
 cxx_xfree(void * ptr)
 {
-  xfree(ptr);
+    xfree(ptr);
 }
 
 FREE *