From: Francesco Chemolli Date: Mon, 3 Sep 2012 09:02:20 +0000 (+0200) Subject: Removed duplicate empty lines. X-Git-Tag: sourceformat-review-1~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea372f740b401006553b3ca157750370f1cc783d;p=thirdparty%2Fsquid.git Removed duplicate empty lines. --- diff --git a/src/HttpHeader.h b/src/HttpHeader.h index ff1be34f01..c9dba5c47b 100644 --- a/src/HttpHeader.h +++ b/src/HttpHeader.h @@ -304,5 +304,4 @@ HttpHeader::chunked() const extern void httpHeaderInitModule(void); extern void httpHeaderCleanModule(void); - #endif /* SQUID_HTTPHEADER_H */ diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc index f4bc95a278..deca225b6e 100644 --- a/src/HttpHeaderTools.cc +++ b/src/HttpHeaderTools.cc @@ -179,8 +179,6 @@ httpHeaderHasConnDir(const HttpHeader * hdr, const char *directive) return res; } - - /** handy to printf prefixes of potentially very long buffers */ const char * getStringPrefix(const char *str, const char *end) diff --git a/src/HttpHeaderTools.h b/src/HttpHeaderTools.h index f6a051d589..35ae04529c 100644 --- a/src/HttpHeaderTools.h +++ b/src/HttpHeaderTools.h @@ -112,5 +112,4 @@ extern const char *getStringPrefix(const char *str, const char *end); extern void httpHdrMangleList(HttpHeader *, HttpRequest *, int req_or_rep); - #endif diff --git a/src/SquidIpc.h b/src/SquidIpc.h index 007e27b3b9..2a435ed5d8 100644 --- a/src/SquidIpc.h +++ b/src/SquidIpc.h @@ -44,8 +44,4 @@ extern pid_t ipcCreate(int type, int *wfd, void **hIpc); - - - - #endif /* SQUID_SQUIDIPC_H_ */ diff --git a/src/StoreClient.h b/src/StoreClient.h index de0fa254e7..1e9d87d472 100644 --- a/src/StoreClient.h +++ b/src/StoreClient.h @@ -125,7 +125,6 @@ private: CBDATA_CLASS(store_client); }; - extern void storeClientCopy(store_client *, StoreEntry *, StoreIOBuffer, STCB *, void *); extern store_client* storeClientListAdd(StoreEntry * e, void *data); extern int storeClientCopyPending(store_client *, StoreEntry * e, void *data); @@ -133,5 +132,4 @@ extern int storeUnregister(store_client * sc, StoreEntry * e, void *data); extern int storePendingNClients(const StoreEntry * e); extern int storeClientIsThisAClient(store_client * sc, void *someClient); - #endif /* SQUID_STORECLIENT_H */ diff --git a/src/WinSvc.h b/src/WinSvc.h index 0ebd69e99a..852bc155f5 100644 --- a/src/WinSvc.h +++ b/src/WinSvc.h @@ -47,7 +47,4 @@ inline void WIN32_InstallService(void) {} /* NOP */ inline void WIN32_RemoveService(void) {} /* NOP */ #endif /* _SQUID_WINDOWS_ */ - - - #endif /* WINSVC_H_ */ diff --git a/src/peer_proxy_negotiate_auth.h b/src/peer_proxy_negotiate_auth.h index 36c3a792cb..4d33c9e744 100644 --- a/src/peer_proxy_negotiate_auth.h +++ b/src/peer_proxy_negotiate_auth.h @@ -37,5 +37,4 @@ SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy); #endif - #endif /* SQUID_PEER_PROXY_NEGOTIATE_AUTH_H_ */ diff --git a/src/snmp_core.h b/src/snmp_core.h index 509472c223..6ed52c6211 100644 --- a/src/snmp_core.h +++ b/src/snmp_core.h @@ -48,5 +48,4 @@ extern const char * snmpDebugOid(oid * Name, snint Len, MemBuf &outbuf); extern void addr2oid(Ip::Address &addr, oid *Dest); extern void oid2addr(oid *Dest, Ip::Address &addr, u_int code); - #endif /* SQUID_SNMP_CORE_H */ diff --git a/src/store_rebuild.h b/src/store_rebuild.h index 4088fe2505..64998dbcdb 100644 --- a/src/store_rebuild.h +++ b/src/store_rebuild.h @@ -43,6 +43,4 @@ 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); - - #endif /* SQUID_STORE_REBUILD_H_ */ diff --git a/src/structs.h b/src/structs.h index 8352e2a524..0633924959 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1030,7 +1030,6 @@ private: unsigned int destinationIPLookedUp_:1; }; - struct _cachemgr_passwd { char *passwd; wordlist *actions; diff --git a/src/tests/stub_ipc.cc b/src/tests/stub_ipc.cc index 175926fedd..77c6bc83ca 100644 --- a/src/tests/stub_ipc.cc +++ b/src/tests/stub_ipc.cc @@ -4,5 +4,4 @@ #define STUB_API "ipc.cc" #include "tests/STUB.h" - pid_t ipcCreate(int, const char *, const char *const [], const char *, Ip::Address &, int *, int *, void **) STUB_RETVAL(-1) diff --git a/src/typedefs.h b/src/typedefs.h index b789d2d9c9..8a93596141 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -85,7 +85,6 @@ typedef struct _CacheDigest CacheDigest; typedef struct _Version Version; - typedef struct _customlog customlog; #if USE_SSL diff --git a/src/win32.h b/src/win32.h index 04593a74c3..b875c09dc8 100644 --- a/src/win32.h +++ b/src/win32.h @@ -33,7 +33,6 @@ * */ - #if _SQUID_MSWIN_ #if HAVE_SYS_TIME_H @@ -59,6 +58,4 @@ extern DWORD WIN32_IpAddrChangeMonitorInit(); #endif - - #endif /* SQUID_WIN32_H_ */