From: Francesco Chemolli Date: Tue, 18 Sep 2012 12:37:07 +0000 (+0200) Subject: Removed duplicate empty lines X-Git-Tag: SQUID_3_3_0_1~33^2~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=728b7753d4f43f06b6ceae6ff298306b709ff030;p=thirdparty%2Fsquid.git Removed duplicate empty lines --- diff --git a/src/CacheMgrPasswd.cc b/src/CacheMgrPasswd.cc index 837bb692d0..8260d3bb4d 100644 --- a/src/CacheMgrPasswd.cc +++ b/src/CacheMgrPasswd.cc @@ -30,4 +30,3 @@ #include "squid.h" #include "CacheMgrPasswd.h" - diff --git a/src/CacheMgrPasswd.h b/src/CacheMgrPasswd.h index 0ca6feb0c0..c90b81b1ab 100644 --- a/src/CacheMgrPasswd.h +++ b/src/CacheMgrPasswd.h @@ -40,5 +40,4 @@ public: CacheMgrPasswd *next; }; - #endif /* SQUID_CACHEMGRPASSWD_H_ */ diff --git a/src/HttpHeaderFieldInfo.h b/src/HttpHeaderFieldInfo.h index 8af6608745..34f2a1fc61 100644 --- a/src/HttpHeaderFieldInfo.h +++ b/src/HttpHeaderFieldInfo.h @@ -44,6 +44,4 @@ public: HttpHeaderFieldStat stat; }; - - #endif /* SQUID_HTTPHEADERFIELDINFO_H_ */ diff --git a/src/HttpHeaderFieldStat.h b/src/HttpHeaderFieldStat.h index 77ed5124d3..026dffb513 100644 --- a/src/HttpHeaderFieldStat.h +++ b/src/HttpHeaderFieldStat.h @@ -42,7 +42,4 @@ public: int repCount; /* #repetitons */ }; - - - #endif /* SQUID_HTTPHEADERFIELDSTAT_H_ */ diff --git a/src/ICP.h b/src/ICP.h index 92591220f4..6cb2a0444c 100644 --- a/src/ICP.h +++ b/src/ICP.h @@ -78,7 +78,6 @@ struct _icp_common_t { }; typedef struct _icp_common_t icp_common_t; - #ifdef __cplusplus /// \ingroup ServerProtocolICPAPI diff --git a/src/RequestFlags.cc b/src/RequestFlags.cc index e19df2e275..5e0182b02f 100644 --- a/src/RequestFlags.cc +++ b/src/RequestFlags.cc @@ -86,7 +86,6 @@ RequestFlags::clearRanged() isRanged_ = false; } - RequestFlags RequestFlags::cloneAdaptationImmune() const { diff --git a/src/SquidConfig.h b/src/SquidConfig.h index 9f7c416707..65a6953f7c 100644 --- a/src/SquidConfig.h +++ b/src/SquidConfig.h @@ -537,7 +537,6 @@ public: extern SquidConfig Config; - struct SquidConfig2 { struct { int enable_purge; diff --git a/src/YesNoNone.h b/src/YesNoNone.h index 17965556fa..c655984358 100644 --- a/src/YesNoNone.h +++ b/src/YesNoNone.h @@ -52,5 +52,4 @@ private: int option; ///< configured value or zero }; - #endif /* SQUID_YESNONONE_H_ */ diff --git a/src/acl/AclDenyInfoList.h b/src/acl/AclDenyInfoList.h index 7b11b1c7e5..5ee7164f5b 100644 --- a/src/acl/AclDenyInfoList.h +++ b/src/acl/AclDenyInfoList.h @@ -40,5 +40,4 @@ public: AclDenyInfoList *next; }; - #endif /* SQUID_ACLDENYINFOLIST_H_ */ diff --git a/src/icmp/net_db.h b/src/icmp/net_db.h index 55c0eb3349..2c523c2064 100644 --- a/src/icmp/net_db.h +++ b/src/icmp/net_db.h @@ -45,7 +45,6 @@ public: int n_peers; }; - extern void netdbInit(void); extern void netdbHandlePingReply(const Ip::Address &from, int hops, int rtt); diff --git a/src/log/CustomLog.h b/src/log/CustomLog.h index 635c071f66..f5c1d3bb1d 100644 --- a/src/log/CustomLog.h +++ b/src/log/CustomLog.h @@ -44,5 +44,4 @@ public: Log::Format::log_type type; }; - #endif /* SQUID_CUSTOMLOG_H_ */ diff --git a/src/ssl/context_storage.h b/src/ssl/context_storage.h index 07a1637652..7f200af3ac 100644 --- a/src/ssl/context_storage.h +++ b/src/ssl/context_storage.h @@ -19,7 +19,6 @@ #endif #include - /// TODO: Replace on real size. #define SSL_CTX_SIZE 1024 diff --git a/src/structs.h b/src/structs.h index 6db3f1fd2c..658b0a1049 100644 --- a/src/structs.h +++ b/src/structs.h @@ -147,7 +147,6 @@ struct _fde_disk { off_t offset; }; - class http_state_flags { public: unsigned int proxying:1; @@ -183,7 +182,6 @@ public: class PeerDigest; - #if USE_SSL struct _sslproxy_cert_sign { int alg;