------------------------------------------------------------
revno: 12304
revision-id: squidadm@squid-cache.org-20120829001228-jsjlfbudkp9dnj58
parent: kinkie@squid-cache.org-20120828191213-12bx12k9mj4zqq1o
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Tue 2012-08-28 18:12:28 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20120829001228-\
#   jsjlfbudkp9dnj58
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: c8dd57b640aa175431a985cef325b4047d2eba8c
# timestamp: 2012-08-29 00:52:49 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: kinkie@squid-cache.org-20120828191213-\
#   12bx12k9mj4zqq1o
# 
# Begin patch
=== modified file 'src/CacheDigest.h'
--- src/CacheDigest.h	2012-08-28 19:12:13 +0000
+++ src/CacheDigest.h	2012-08-29 00:12:28 +0000
@@ -27,7 +27,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.
- * 
+ *
  */
 
 #ifndef SQUID_CACHEDIGEST_H_
@@ -51,5 +51,4 @@
 extern void cacheDigestGuessStatsReport(const CacheDigestGuessStats * stats, StoreEntry * sentry, const char *label);
 extern void cacheDigestReport(CacheDigest * cd, const char *label, StoreEntry * e);
 
-
 #endif /* SQUID_CACHEDIGEST_H_ */

=== modified file 'src/ExternalACL.h'
--- src/ExternalACL.h	2012-08-28 19:12:13 +0000
+++ src/ExternalACL.h	2012-08-29 00:12:28 +0000
@@ -104,5 +104,4 @@
 extern void externalAclInit(void);
 extern void externalAclShutdown(void);
 
-
 #endif /* SQUID_EXTERNALACL_H */

=== modified file 'src/HttpHeaderTools.h'
--- src/HttpHeaderTools.h	2012-08-28 19:12:13 +0000
+++ src/HttpHeaderTools.h	2012-08-29 00:12:28 +0000
@@ -106,5 +106,4 @@
 extern int httpHeaderParseInt(const char *start, int *val);
 extern void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3;
 
-
 #endif

=== modified file 'src/PeerDigest.h'
--- src/PeerDigest.h	2012-08-28 19:12:13 +0000
+++ src/PeerDigest.h	2012-08-29 00:12:28 +0000
@@ -136,7 +136,6 @@
 extern void peerDigestNotePeerGone(PeerDigest * pd);
 extern void peerDigestStatsReport(const PeerDigest * pd, StoreEntry * e);
 
-
 #endif /* USE_CACHE_DIGESTS */
 
 #endif /* SQUID_PEERDIGEST_H */

=== modified file 'src/URL.h'
--- src/URL.h	2012-08-28 19:12:13 +0000
+++ src/URL.h	2012-08-29 00:12:28 +0000
@@ -81,7 +81,6 @@
 class HttpRequest;
 class HttpRequestMethod;
 
-
 extern AnyP::ProtocolType urlParseProtocol(const char *, const char *e = NULL);
 extern void urlInitialize(void);
 extern HttpRequest *urlParse(const HttpRequestMethod&, char *, HttpRequest *request = NULL);

=== modified file 'src/cache_cf.h'
--- src/cache_cf.h	2012-08-28 19:12:13 +0000
+++ src/cache_cf.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_CACHE_CF_H_
 #define SQUID_CACHE_CF_H_
 

=== modified file 'src/carp.h'
--- src/carp.h	2012-08-28 19:12:13 +0000
+++ src/carp.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_CARP_H_
 #define SQUID_CARP_H_
 

=== modified file 'src/client_db.h'
--- src/client_db.h	2012-08-28 19:12:13 +0000
+++ src/client_db.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_CLIENT_DB_H_
 #define SQUID_CLIENT_DB_H_
 
@@ -53,5 +52,4 @@
 extern ClientInfo * clientdbGetInfo(const Ip::Address &addr);
 #endif
 
-
 #endif /* SQUID_CLIENT_DB_H_ */

=== modified file 'src/disk.h'
--- src/disk.h	2012-08-28 19:12:13 +0000
+++ src/disk.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_DISK_H_
 #define SQUID_DISK_H_
 

=== modified file 'src/fd.h'
--- src/fd.h	2012-08-28 19:12:13 +0000
+++ src/fd.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_FD_H_
 #define SQUID_FD_H_
 

=== modified file 'src/fqdncache.cc'
--- src/fqdncache.cc	2012-08-28 19:12:13 +0000
+++ src/fqdncache.cc	2012-08-29 00:12:28 +0000
@@ -587,7 +587,6 @@
 #endif
 }
 
-
 /**
  \ingroup FQDNCacheAPI
  *

=== modified file 'src/fqdncache.h'
--- src/fqdncache.h	2012-08-28 19:12:13 +0000
+++ src/fqdncache.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_FQDNCACHE_H_
 #define SQUID_FQDNCACHE_H_
 
@@ -53,7 +52,4 @@
 //extern const char *fqdnFromAddr(const Ip::Address &);
 extern void fqdncache_nbgethostbyaddr(const Ip::Address &, FQDNH *, void *);
 
-
-
-
 #endif /* SQUID_FQDNCACHE_H_ */

=== modified file 'src/ftp.h'
--- src/ftp.h	2012-08-28 19:12:13 +0000
+++ src/ftp.h	2012-08-29 00:12:28 +0000
@@ -45,5 +45,4 @@
 /// \ingroup ServerProtocolFTPAPI
 extern const char *ftpUrlWith2f(HttpRequest *);
 
-
 #endif /* SQUID_FTP_H_ */

=== modified file 'src/gopher.h'
--- src/gopher.h	2012-08-28 19:12:13 +0000
+++ src/gopher.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_GOPHER_H_
 #define SQUID_GOPHER_H_
 
@@ -48,5 +47,4 @@
 /// \ingroup ServerProtocolGopherAPI
 extern int gopherCachable(const HttpRequest *);
 
-
 #endif /* SQUID_GOPHER_H_ */

=== modified file 'src/http.h'
--- src/http.h	2012-08-28 19:12:13 +0000
+++ src/http.h	2012-08-29 00:12:28 +0000
@@ -139,5 +139,4 @@
 extern void httpStart(FwdState *);
 extern const char *httpMakeVaryMark(HttpRequest * request, HttpReply const * reply);
 
-
 #endif /* SQUID_HTTP_H */

=== modified file 'src/icmp/net_db.cc'
--- src/icmp/net_db.cc	2012-08-28 19:12:13 +0000
+++ src/icmp/net_db.cc	2012-08-29 00:12:28 +0000
@@ -61,7 +61,6 @@
 #include "Mem.h"
 #include "disk.h"
 
-
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif

=== modified file 'src/internal.h'
--- src/internal.h	2012-08-28 19:12:13 +0000
+++ src/internal.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_INTERNAL_H_
 #define SQUID_INTERNAL_H_
 
@@ -46,6 +45,4 @@
 extern const char *internalHostname(void);
 extern int internalHostnameIs(const char *);
 
-
-
 #endif /* SQUID_INTERNAL_H_ */

=== modified file 'src/log/access_log.h'
--- src/log/access_log.h	2012-08-28 19:12:13 +0000
+++ src/log/access_log.h	2012-08-29 00:12:28 +0000
@@ -27,13 +27,12 @@
  *  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.
- * 
+ *
  */
 
 #ifndef SQUID_LOG_ACCESS_LOG_H_
 #define SQUID_LOG_ACCESS_LOG_H_
 
-
 extern int logTypeIsATcpHit(log_type);
 extern void fvdbCountVia(const char *key);
 extern void fvdbCountForw(const char *key);
@@ -43,5 +42,4 @@
 extern void headersLog(int cs, int pq, const HttpRequestMethod& m, void *data);
 #endif
 
-
 #endif /* SQUID_LOG_ACCESS_LOG_H_ */

=== modified file 'src/neighbors.h'
--- src/neighbors.h	2012-08-28 19:12:13 +0000
+++ src/neighbors.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_NEIGHBORS_H_
 #define SQUID_NEIGHBORS_H_
 

=== modified file 'src/peer_sourcehash.h'
--- src/peer_sourcehash.h	2012-08-28 19:12:13 +0000
+++ src/peer_sourcehash.h	2012-08-29 00:12:28 +0000
@@ -31,7 +31,6 @@
  *
  */
 
-
 #ifndef SQUID_PEER_SOURCEHASH_H_
 #define SQUID_PEER_SOURCEHASH_H_
 
@@ -41,6 +40,4 @@
 extern void peerSourceHashInit(void);
 extern peer * peerSourceHashSelectParent(HttpRequest * request);
 
-
-
 #endif /* SQUID_PEER_SOURCEHASH_H_ */

=== modified file 'src/peer_userhash.h'
--- src/peer_userhash.h	2012-08-28 19:12:13 +0000
+++ src/peer_userhash.h	2012-08-29 00:12:28 +0000
@@ -31,7 +31,6 @@
  *
  */
 
-
 #ifndef SQUID_PEER_USERHASH_H_
 #define SQUID_PEER_USERHASH_H_
 

=== modified file 'src/protos.h'
--- src/protos.h	2012-08-28 19:12:13 +0000
+++ src/protos.h	2012-08-29 00:12:28 +0000
@@ -45,16 +45,13 @@
 #include "HttpStatusCode.h"
 #include "lookup_t.h"
 
-
 class HttpRequestMethod;
 #if USE_DELAY_POOLS
 class ClientInfo;
 #endif
 
-
 class FwdState;
 
-
 class HttpRequest;
 class HttpReply;
 
@@ -66,8 +63,6 @@
 
 extern const char *getStringPrefix(const char *str, const char *end);
 
-
-
 /* store report about current header usage and other stats */
 void httpHeaderStoreReport(StoreEntry * e);
 SQUIDCEXTERN void httpHdrMangleList(HttpHeader *, HttpRequest *, int req_or_rep);
@@ -123,12 +118,10 @@
 SQUIDCEXTERN void redirectInit(void);
 SQUIDCEXTERN void redirectShutdown(void);
 
-
 extern void shut_down(int);
 extern void rotate_logs(int);
 extern void reconfigure(int);
 
-
 extern void start_announce(void *unused);
 extern void waisStart(FwdState *);
 
@@ -145,7 +138,6 @@
 extern void storeLogClose(void);
 extern void storeLogOpen(void);
 
-
 /*
  * store_digest.c
  */
@@ -170,7 +162,6 @@
 /// checks whether the loaded entry should be kept; updates counters
 extern bool storeRebuildKeepEntry(const StoreEntry &e, const cache_key *key, struct _store_rebuild_data &counts);
 
-
 /*
  * store_swapin.c
  */
@@ -187,7 +178,6 @@
 SQUIDCEXTERN int storePendingNClients(const StoreEntry * e);
 SQUIDCEXTERN int storeClientIsThisAClient(store_client * sc, void *someClient);
 
-
 SQUIDCEXTERN const char *getMyHostname(void);
 SQUIDCEXTERN const char *uniqueHostname(void);
 SQUIDCEXTERN void safeunlink(const char *path, int quiet);
@@ -256,7 +246,6 @@
 SQUIDCEXTERN void unlinkdUnlink(const char *);
 #endif
 
-
 SQUIDCEXTERN peer_t parseNeighborType(const char *s);
 
 SQUIDCEXTERN int stringHasWhitespace(const char *); //String.cc
@@ -268,7 +257,6 @@
 
 SQUIDCEXTERN char *strwordtok(char *buf, char **t); //String.cc
 
-
 /*
  * ipc.c
  */
@@ -281,7 +269,6 @@
                              int *wfd,
                              void **hIpc);
 
-
 /*
  * prototypes for system functions missing from system includes
  */
@@ -302,7 +289,6 @@
 class StatCounters;
         SQUIDCEXTERN StatCounters *snmpStatGet(int);
 
-
         /* CygWin & Windows NT Port */
         /* win32.c */
 #if _SQUID_WINDOWS_
@@ -327,19 +313,19 @@
 
 #endif
 
-extern char *strtokFile(void);
+    extern char *strtokFile(void);
 
 #if USE_AUTH
 
 #if HAVE_AUTH_MODULE_NEGOTIATE && HAVE_KRB5 && HAVE_GSSAPI
-                /* upstream proxy authentication */
-                SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
+    /* upstream proxy authentication */
+    SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
 #endif
 
-                    namespace Auth {
-            /* call to ensure the auth component schemes exist. */
-            extern void Init(void);
-            } // namespace Auth
+    namespace Auth {
+    /* call to ensure the auth component schemes exist. */
+    extern void Init(void);
+    } // namespace Auth
 
 #endif /* USE_AUTH */
 

=== modified file 'src/refresh.h'
--- src/refresh.h	2012-08-28 19:12:13 +0000
+++ src/refresh.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_REFRESH_H_
 #define SQUID_REFRESH_H_
 
@@ -44,6 +43,4 @@
 extern void refreshInit(void);
 extern const refresh_t *refreshLimits(const char *url);
 
-
-
 #endif /* SQUID_REFRESH_H_ */

=== modified file 'src/tools.h'
--- src/tools.h	2012-08-28 19:12:13 +0000
+++ src/tools.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_TOOLS_H_
 #define SQUID_TOOLS_H_
 
@@ -48,5 +47,4 @@
 /* packs, then prints an object using debugs() */
 extern void debugObj(int section, int level, const char *label, void *obj, ObjPackMethod pm);
 
-
 #endif /* SQUID_TOOLS_H_ */

=== modified file 'src/wccp.h'
--- src/wccp.h	2012-08-28 19:12:13 +0000
+++ src/wccp.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_WCCP_H_
 #define SQUID_WCCP_H_
 
@@ -40,6 +39,4 @@
 extern void wccpConnectionClose(void);
 #endif /* USE_WCCP */
 
-
-
 #endif /* SQUID_WCCP_H_ */

=== modified file 'src/wccp2.h'
--- src/wccp2.h	2012-08-28 19:12:13 +0000
+++ src/wccp2.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_WCCP2_H_
 #define SQUID_WCCP2_H_
 

=== modified file 'src/whois.h'
--- src/whois.h	2012-08-28 19:12:13 +0000
+++ src/whois.h	2012-08-29 00:12:28 +0000
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_WHOIS_H_
 #define SQUID_WHOIS_H_
 
@@ -42,5 +41,4 @@
 /// \ingroup ServerProtocolWhoisAPI
 extern void whoisStart(FwdState *);
 
-
 #endif /* SQUID_WHOIS_H_ */