From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Wed, 29 Aug 2012 00:12:28 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: sourceformat-review-1~63^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bc5d26041ba4b84aa61793c25616a294c807800;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/CacheDigest.h b/src/CacheDigest.h
index b9f1304b77..2d44bf42d6 100644
--- a/src/CacheDigest.h
+++ b/src/CacheDigest.h
@@ -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 cacheDigestGuessStatsUpdate(CacheDigestGuessStats * stats, int real_
 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_ */
diff --git a/src/ExternalACL.h b/src/ExternalACL.h
index 125c3535a7..58ca645217 100644
--- a/src/ExternalACL.h
+++ b/src/ExternalACL.h
@@ -104,5 +104,4 @@ extern void externalAclLookup(ACLChecklist * ch, void *acl_data, EAH * handler,
 extern void externalAclInit(void);
 extern void externalAclShutdown(void);
 
-
 #endif /* SQUID_EXTERNALACL_H */
diff --git a/src/HttpHeaderTools.h b/src/HttpHeaderTools.h
index 1da330e32b..4f811bfa38 100644
--- a/src/HttpHeaderTools.h
+++ b/src/HttpHeaderTools.h
@@ -106,5 +106,4 @@ extern int httpHeaderHasConnDir(const HttpHeader * hdr, const char *directive);
 extern int httpHeaderParseInt(const char *start, int *val);
 extern void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3;
 
-
 #endif
diff --git a/src/PeerDigest.h b/src/PeerDigest.h
index 3dd90d8416..f218ce70ab 100644
--- a/src/PeerDigest.h
+++ b/src/PeerDigest.h
@@ -136,7 +136,6 @@ extern void peerDigestNeeded(PeerDigest * pd);
 extern void peerDigestNotePeerGone(PeerDigest * pd);
 extern void peerDigestStatsReport(const PeerDigest * pd, StoreEntry * e);
 
-
 #endif /* USE_CACHE_DIGESTS */
 
 #endif /* SQUID_PEERDIGEST_H */
diff --git a/src/URL.h b/src/URL.h
index ab95fc84f7..c7e621aed6 100644
--- a/src/URL.h
+++ b/src/URL.h
@@ -81,7 +81,6 @@ MEMPROXY_CLASS_INLINE(URL);
 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);
diff --git a/src/cache_cf.h b/src/cache_cf.h
index 93f555b44e..cf2ffd7b24 100644
--- a/src/cache_cf.h
+++ b/src/cache_cf.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_CACHE_CF_H_
 #define SQUID_CACHE_CF_H_
 
diff --git a/src/carp.h b/src/carp.h
index c3799cdf89..be7be8fce6 100644
--- a/src/carp.h
+++ b/src/carp.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_CARP_H_
 #define SQUID_CARP_H_
 
diff --git a/src/client_db.h b/src/client_db.h
index 81bdcaf7ce..c764e0dd0b 100644
--- a/src/client_db.h
+++ b/src/client_db.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_CLIENT_DB_H_
 #define SQUID_CLIENT_DB_H_
 
@@ -53,5 +52,4 @@ extern void clientdbSetWriteLimiter(ClientInfo * info, const int writeSpeedLimit
 extern ClientInfo * clientdbGetInfo(const Ip::Address &addr);
 #endif
 
-
 #endif /* SQUID_CLIENT_DB_H_ */
diff --git a/src/disk.h b/src/disk.h
index 134784f20d..d5130735a4 100644
--- a/src/disk.h
+++ b/src/disk.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_DISK_H_
 #define SQUID_DISK_H_
 
diff --git a/src/fd.h b/src/fd.h
index a6cbf68445..316f244f1d 100644
--- a/src/fd.h
+++ b/src/fd.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_FD_H_
 #define SQUID_FD_H_
 
diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 9bf85bf30c..0a258ab76b 100644
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -587,7 +587,6 @@ fqdncache_nbgethostbyaddr(const Ip::Address &addr, FQDNH * handler, void *handle
 #endif
 }
 
-
 /**
  \ingroup FQDNCacheAPI
  *
diff --git a/src/fqdncache.h b/src/fqdncache.h
index e0119cfb5d..e261416711 100644
--- a/src/fqdncache.h
+++ b/src/fqdncache.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_FQDNCACHE_H_
 #define SQUID_FQDNCACHE_H_
 
@@ -53,7 +52,4 @@ extern const char *fqdncache_gethostbyaddr(const Ip::Address &, int flags);
 //extern const char *fqdnFromAddr(const Ip::Address &);
 extern void fqdncache_nbgethostbyaddr(const Ip::Address &, FQDNH *, void *);
 
-
-
-
 #endif /* SQUID_FQDNCACHE_H_ */
diff --git a/src/ftp.h b/src/ftp.h
index a3d2abd4fc..e128c0a288 100644
--- a/src/ftp.h
+++ b/src/ftp.h
@@ -45,5 +45,4 @@ extern void ftpStart(FwdState *);
 /// \ingroup ServerProtocolFTPAPI
 extern const char *ftpUrlWith2f(HttpRequest *);
 
-
 #endif /* SQUID_FTP_H_ */
diff --git a/src/gopher.h b/src/gopher.h
index f8b0827262..51e4659b3b 100644
--- a/src/gopher.h
+++ b/src/gopher.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_GOPHER_H_
 #define SQUID_GOPHER_H_
 
@@ -48,5 +47,4 @@ extern void gopherStart(FwdState *);
 /// \ingroup ServerProtocolGopherAPI
 extern int gopherCachable(const HttpRequest *);
 
-
 #endif /* SQUID_GOPHER_H_ */
diff --git a/src/http.h b/src/http.h
index 274bd3c531..f373663f42 100644
--- a/src/http.h
+++ b/src/http.h
@@ -139,5 +139,4 @@ extern int httpCachable(const HttpRequestMethod&);
 extern void httpStart(FwdState *);
 extern const char *httpMakeVaryMark(HttpRequest * request, HttpReply const * reply);
 
-
 #endif /* SQUID_HTTP_H */
diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc
index 9d9fd66e30..98e52a89c3 100644
--- a/src/icmp/net_db.cc
+++ b/src/icmp/net_db.cc
@@ -61,7 +61,6 @@
 #include "Mem.h"
 #include "disk.h"
 
-
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
diff --git a/src/internal.h b/src/internal.h
index 7595f93f03..d24ead2728 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_INTERNAL_H_
 #define SQUID_INTERNAL_H_
 
@@ -46,6 +45,4 @@ extern char *internalRemoteUri(const char *, unsigned short, const char *, const
 extern const char *internalHostname(void);
 extern int internalHostnameIs(const char *);
 
-
-
 #endif /* SQUID_INTERNAL_H_ */
diff --git a/src/log/access_log.h b/src/log/access_log.h
index 92c0b7e14a..f64b665e0b 100644
--- a/src/log/access_log.h
+++ b/src/log/access_log.h
@@ -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 @@ class HttpRequestMethod;
 extern void headersLog(int cs, int pq, const HttpRequestMethod& m, void *data);
 #endif
 
-
 #endif /* SQUID_LOG_ACCESS_LOG_H_ */
diff --git a/src/neighbors.h b/src/neighbors.h
index a045f9ec59..f62195ad09 100644
--- a/src/neighbors.h
+++ b/src/neighbors.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_NEIGHBORS_H_
 #define SQUID_NEIGHBORS_H_
 
diff --git a/src/peer_sourcehash.h b/src/peer_sourcehash.h
index 869a47f24d..10685c3810 100644
--- a/src/peer_sourcehash.h
+++ b/src/peer_sourcehash.h
@@ -31,7 +31,6 @@
  *
  */
 
-
 #ifndef SQUID_PEER_SOURCEHASH_H_
 #define SQUID_PEER_SOURCEHASH_H_
 
@@ -41,6 +40,4 @@ class HttpRequest;
 extern void peerSourceHashInit(void);
 extern peer * peerSourceHashSelectParent(HttpRequest * request);
 
-
-
 #endif /* SQUID_PEER_SOURCEHASH_H_ */
diff --git a/src/peer_userhash.h b/src/peer_userhash.h
index 4a026ca641..b1dc6ccc33 100644
--- a/src/peer_userhash.h
+++ b/src/peer_userhash.h
@@ -31,7 +31,6 @@
  *
  */
 
-
 #ifndef SQUID_PEER_USERHASH_H_
 #define SQUID_PEER_USERHASH_H_
 
diff --git a/src/protos.h b/src/protos.h
index 1f335c0bb8..110896e733 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -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 @@ SQUIDCEXTERN int strListGetItem(const String * str, char del, const char **item,
 
 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 urnStart(HttpRequest *, StoreEntry *);
 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 storeLogRotate(void);
 extern void storeLogClose(void);
 extern void storeLogOpen(void);
 
-
 /*
  * store_digest.c
  */
@@ -170,7 +162,6 @@ extern bool storeRebuildParseEntry(MemBuf &buf, StoreEntry &e, cache_key *key, s
 /// 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 storeUnregister(store_client * sc, StoreEntry * e, void *data)
 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 unlinkdClose(void);
 SQUIDCEXTERN void unlinkdUnlink(const char *);
 #endif
 
-
 SQUIDCEXTERN peer_t parseNeighborType(const char *s);
 
 SQUIDCEXTERN int stringHasWhitespace(const char *); //String.cc
@@ -268,7 +257,6 @@ extern int isPowTen(int); //int.cc
 
 SQUIDCEXTERN char *strwordtok(char *buf, char **t); //String.cc
 
-
 /*
  * ipc.c
  */
@@ -281,7 +269,6 @@ SQUIDCEXTERN pid_t ipcCreate(int type,
                              int *wfd,
                              void **hIpc);
 
-
 /*
  * prototypes for system functions missing from system includes
  */
@@ -302,7 +289,6 @@ SQUIDCEXTERN int gethostname(char *, int);
 class StatCounters;
         SQUIDCEXTERN StatCounters *snmpStatGet(int);
 
-
         /* CygWin & Windows NT Port */
         /* win32.c */
 #if _SQUID_WINDOWS_
@@ -327,19 +313,19 @@ class StatCounters;
 
 #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 */
 
diff --git a/src/refresh.h b/src/refresh.h
index e1c8a14ad0..1c6b9d36d2 100644
--- a/src/refresh.h
+++ b/src/refresh.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_REFRESH_H_
 #define SQUID_REFRESH_H_
 
@@ -44,6 +43,4 @@ extern time_t getMaxAge(const char *url);
 extern void refreshInit(void);
 extern const refresh_t *refreshLimits(const char *url);
 
-
-
 #endif /* SQUID_REFRESH_H_ */
diff --git a/src/tools.h b/src/tools.h
index 3ffcc26a56..4b5d670b8e 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_TOOLS_H_
 #define SQUID_TOOLS_H_
 
@@ -48,5 +47,4 @@ extern void strwordquote(MemBuf * mb, const char *str);
 /* 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_ */
diff --git a/src/wccp.h b/src/wccp.h
index 7fdbe9e2d5..3d03bf46d5 100644
--- a/src/wccp.h
+++ b/src/wccp.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_WCCP_H_
 #define SQUID_WCCP_H_
 
@@ -40,6 +39,4 @@ extern void wccpConnectionOpen(void);
 extern void wccpConnectionClose(void);
 #endif /* USE_WCCP */
 
-
-
 #endif /* SQUID_WCCP_H_ */
diff --git a/src/wccp2.h b/src/wccp2.h
index 647401326a..532903c4d9 100644
--- a/src/wccp2.h
+++ b/src/wccp2.h
@@ -30,7 +30,6 @@
  *
  */
 
-
 #ifndef SQUID_WCCP2_H_
 #define SQUID_WCCP2_H_
 
diff --git a/src/whois.h b/src/whois.h
index 6859e02151..a73aa56acc 100644
--- a/src/whois.h
+++ b/src/whois.h
@@ -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_ */