------------------------------------------------------------
revno: 12321
revision-id: squidadm@squid-cache.org-20120914001320-ahm5d4r8vsukrx6j
parent: kinkie@squid-cache.org-20120913113930-cyu8k2mwqhyfy55e
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Thu 2012-09-13 18:13:20 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20120914001320-\
#   ahm5d4r8vsukrx6j
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 623eadf52913613f1730febabbe77b9551fb396d
# timestamp: 2012-09-14 00:53:36 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: kinkie@squid-cache.org-20120913113930-\
#   cyu8k2mwqhyfy55e
# 
# Begin patch
=== modified file 'doc/debug-sections.txt'
--- doc/debug-sections.txt	2012-02-06 01:21:18 +0000
+++ doc/debug-sections.txt	2012-09-14 00:13:20 +0000
@@ -1,4 +1,5 @@
 
+section
 section --    CGI Cache Manager
 section --    External DISKD process implementation.
 section --    Refcount allocator
@@ -129,6 +130,7 @@
 section 79    Squid-side Disk I/O functions.
 section 79    Storage Manager COSS Interface
 section 79    Storage Manager UFS Interface
+section 79   Disk IO Routines
 section 80    WCCP Support
 section 81    CPU Profiling Routines
 section 81    Store HEAP Removal Policies

=== modified file 'src/AuthReg.h'
--- src/AuthReg.h	2012-08-31 16:28:10 +0000
+++ src/AuthReg.h	2012-09-14 00:13:20 +0000
@@ -1,8 +1,8 @@
 #ifndef SQUID_AUTHREG_H_
 #define SQUID_AUTHREG_H_
 /*
- * DEBUG: section 
- * AUTHOR: 
+ * DEBUG: section
+ * AUTHOR:
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
@@ -32,13 +32,14 @@
  *
  */
 
-namespace Auth {
+namespace Auth
+{
 
 #if USE_AUTH
-    /// Initialize Auth subsystem
-    extern void Init(void);
+/// Initialize Auth subsystem
+extern void Init(void);
 #else /* USE_AUTH */
-    inline void Init(void) {} /* NOP if not USE_AUTH */
+inline void Init(void) {} /* NOP if not USE_AUTH */
 #endif /* USE_AUTH */
 
 } // namespace Auth

=== modified file 'src/SquidIpc.h'
--- src/SquidIpc.h	2012-09-03 09:02:20 +0000
+++ src/SquidIpc.h	2012-09-14 00:13:20 +0000
@@ -32,16 +32,17 @@
  *
  */
 
-namespace Ip {
-  class Address;
+namespace Ip
+{
+class Address;
 }
 extern pid_t ipcCreate(int type,
-                             const char *prog,
-                             const char *const args[],
-                             const char *name,
-                             Ip::Address &local_addr,
-                             int *rfd,
-                             int *wfd,
-                             void **hIpc);
+                       const char *prog,
+                       const char *const args[],
+                       const char *name,
+                       Ip::Address &local_addr,
+                       int *rfd,
+                       int *wfd,
+                       void **hIpc);
 
 #endif /* SQUID_SQUIDIPC_H_ */

=== modified file 'src/SquidList.h'
--- src/SquidList.h	2012-08-31 08:48:38 +0000
+++ src/SquidList.h	2012-09-14 00:13:20 +0000
@@ -32,8 +32,9 @@
  *
  */
 
-class link_list {
-    public:
+class link_list
+{
+public:
     void *ptr;
     link_list *next;
 };

=== modified file 'src/WinSvc.h'
--- src/WinSvc.h	2012-09-03 09:02:20 +0000
+++ src/WinSvc.h	2012-09-14 00:13:20 +0000
@@ -29,7 +29,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- * 
+ *
  */
 
 #if _SQUID_WINDOWS_

=== modified file 'src/mime.h'
--- src/mime.h	2012-08-29 12:56:25 +0000
+++ src/mime.h	2012-09-14 00:13:20 +0000
@@ -1,6 +1,6 @@
 /*
- * DEBUG: section 
- * AUTHOR: 
+ * DEBUG: section
+ * AUTHOR:
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------

=== modified file 'src/multicast.h'
--- src/multicast.h	2012-08-29 14:08:06 +0000
+++ src/multicast.h	2012-09-14 00:13:20 +0000
@@ -1,6 +1,6 @@
 /*
- * DEBUG: section 
- * AUTHOR: 
+ * DEBUG: section
+ * AUTHOR:
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------

=== modified file 'src/peer_proxy_negotiate_auth.h'
--- src/peer_proxy_negotiate_auth.h	2012-09-03 09:02:20 +0000
+++ src/peer_proxy_negotiate_auth.h	2012-09-14 00:13:20 +0000
@@ -33,7 +33,7 @@
  */
 
 #if HAVE_AUTH_MODULE_NEGOTIATE && HAVE_KRB5 && HAVE_GSSAPI
-    /* upstream proxy authentication */
+/* upstream proxy authentication */
 SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
 #endif
 

=== modified file 'src/snmp_agent.h'
--- src/snmp_agent.h	2012-08-31 15:45:51 +0000
+++ src/snmp_agent.h	2012-09-14 00:13:20 +0000
@@ -1,8 +1,8 @@
 #ifndef SQUID_SNMP_AGENT_H_
 #define SQUID_SNMP_AGENT_H_
 /*
- * DEBUG: section 
- * AUTHOR: 
+ * DEBUG: section
+ * AUTHOR:
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------

=== modified file 'src/snmp_core.h'
--- src/snmp_core.h	2012-09-03 09:02:20 +0000
+++ src/snmp_core.h	2012-09-14 00:13:20 +0000
@@ -10,8 +10,9 @@
 #include "comm/forward.h"
 #include "typedefs.h"
 
-namespace Ip {
-  class Address;
+namespace Ip
+{
+class Address;
 }
 class MemBuf;
 

=== modified file 'src/urn.h'
--- src/urn.h	2012-08-29 14:39:43 +0000
+++ src/urn.h	2012-09-14 00:13:20 +0000
@@ -1,6 +1,6 @@
 /*
- * DEBUG: section 
- * AUTHOR: 
+ * DEBUG: section
+ * AUTHOR:
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------

=== modified file 'src/win32.h'
--- src/win32.h	2012-09-03 09:02:20 +0000
+++ src/win32.h	2012-09-14 00:13:20 +0000
@@ -30,7 +30,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- * 
+ *
  */
 
 #if _SQUID_MSWIN_