------------------------------------------------------------
revno: 11759
revision-id: squidadm@squid-cache.org-20110924001348-ykfsn4ke199nsib6
parent: squid3@treenet.co.nz-20110923002941-8c99s5sq3bgn1hdn
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Fri 2011-09-23 18:13:48 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20110924001348-\
#   ykfsn4ke199nsib6
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 1d24a9f7fdc3e92a7e2c28624eed57dfedfd15c2
# timestamp: 2011-09-24 00:52:18 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20110923002941-\
#   8c99s5sq3bgn1hdn
# 
# Begin patch
=== modified file 'src/fs/rock/RockSwapDir.cc'
--- src/fs/rock/RockSwapDir.cc	2011-09-22 21:42:46 +0000
+++ src/fs/rock/RockSwapDir.cc	2011-09-24 00:13:48 +0000
@@ -304,7 +304,7 @@
 Rock::SwapDir::allowOptionReconfigure(const char *const option) const
 {
     return strcmp(option, "max-size") != 0 &&
-        ::SwapDir::allowOptionReconfigure(option);
+           ::SwapDir::allowOptionReconfigure(option);
 }
 
 /// parses time-specific options; mimics ::SwapDir::optionObjectSizeParse()

=== modified file 'src/ssl/certificate_db.cc'
--- src/ssl/certificate_db.cc	2011-09-22 16:37:55 +0000
+++ src/ssl/certificate_db.cc	2011-09-24 00:13:48 +0000
@@ -438,7 +438,7 @@
 #else
     sk_delete(db.get()->data, rowIndex);
 #endif
-    
+
     const Columns db_indexes[]={cnlSerial, cnlName};
     for (unsigned int i = 0; i < countof(db_indexes); i++) {
 #if OPENSSL_VERSION_NUMBER >= 0x1000004fL
@@ -449,7 +449,7 @@
             lh_delete(fieldIndex, row);
 #endif
     }
-    
+
     subSize(filename);
     int ret = remove(filename.c_str());
     if (ret < 0)