------------------------------------------------------------
revno: 11621
revision-id: squidadm@squid-cache.org-20110808001219-w7qz8uy4el8cfx3v
parent: chtsanti@users.sourceforge.net-20110807122157-0vashc6hzc2d8ou6
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Sun 2011-08-07 18:12:19 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20110808001219-\
#   w7qz8uy4el8cfx3v
# target_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: dbcb23910b33546aa3b5bbe38c8458d5be44e8b5
# timestamp: 2011-08-08 00:51:55 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: chtsanti@users.sourceforge.net-20110807122157-\
#   0vashc6hzc2d8ou6
# 
# Begin patch
=== modified file 'compat/xstrerror.cc'
--- compat/xstrerror.cc	2011-08-07 09:56:35 +0000
+++ compat/xstrerror.cc	2011-08-08 00:12:19 +0000
@@ -83,7 +83,7 @@
 
 #if _SQUID_WINDOWS_
     // Description of WSAGetLastError()
-    for (size_t i = 0;i < sizeof(_wsaerrtext) / sizeof(struct _wsaerrtext); i++) {
+    for (size_t i = 0; i < sizeof(_wsaerrtext) / sizeof(struct _wsaerrtext); i++) {
         if (_wsaerrtext[i].err == error) {
             // small optimization, save using a temporary buffer and two copies...
             snprintf(xstrerror_buf, BUFSIZ, "(%d) %s, %s", error, _wsaerrtext[i].errconst, _wsaerrtext[i].errdesc);

=== modified file 'src/ip/Address.cc'
--- src/ip/Address.cc	2011-08-07 10:26:09 +0000
+++ src/ip/Address.cc	2011-08-08 00:12:19 +0000
@@ -285,7 +285,7 @@
 {
     // IFF the address == 0xff..ff (all ones)
     return IN6_ARE_ADDR_EQUAL( &m_SocketAddr.sin6_addr, &v6_noaddr )
-        || IN6_ARE_ADDR_EQUAL( &m_SocketAddr.sin6_addr, &v4_noaddr );
+           || IN6_ARE_ADDR_EQUAL( &m_SocketAddr.sin6_addr, &v4_noaddr );
 }
 
 void