From: Francesco Chemolli Date: Tue, 18 Sep 2012 12:54:44 +0000 (+0200) Subject: Fixed class indentation X-Git-Tag: SQUID_3_3_0_1~33^2~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b2f0924f79958e093f0b60d59ecf8ddfe8345f5;p=thirdparty%2Fsquid.git Fixed class indentation --- diff --git a/src/CacheDigest.h b/src/CacheDigest.h index 91c355c05c..e0a81470b0 100644 --- a/src/CacheDigest.h +++ b/src/CacheDigest.h @@ -38,7 +38,8 @@ class CacheDigestGuessStats; class StoreEntry; -class CacheDigest { +class CacheDigest +{ public: /* public, read-only */ char *mask; /* bit mask */ diff --git a/src/CacheMgrPasswd.h b/src/CacheMgrPasswd.h index c90b81b1ab..99baa32296 100644 --- a/src/CacheMgrPasswd.h +++ b/src/CacheMgrPasswd.h @@ -33,7 +33,8 @@ class wordlist; //TODO: this class is misnamed and C-ish. Split into CacheMgrPasswd and // CacheMgrPasswdList (std::list-derived) -class CacheMgrPasswd { +class CacheMgrPasswd +{ public: char *passwd; wordlist *actions; diff --git a/src/CachePeer.h b/src/CachePeer.h index e4ff4d2435..2159199603 100644 --- a/src/CachePeer.h +++ b/src/CachePeer.h @@ -42,7 +42,8 @@ class domain_type; class acl_access; class PeerDigest; -class CachePeer { +class CachePeer +{ public: u_int index; char *name; diff --git a/src/HttpHeader.h b/src/HttpHeader.h index 945c38da6d..7fc28d00b0 100644 --- a/src/HttpHeader.h +++ b/src/HttpHeader.h @@ -178,7 +178,8 @@ typedef enum { hoEnd } http_hdr_owner_type; -class HttpHeaderFieldAttrs { +class HttpHeaderFieldAttrs +{ public: const char *name; http_hdr_type id; diff --git a/src/HttpHeaderTools.h b/src/HttpHeaderTools.h index 6ae43be6f1..e95d655783 100644 --- a/src/HttpHeaderTools.h +++ b/src/HttpHeaderTools.h @@ -19,7 +19,8 @@ class HeaderWithAcl; typedef std::list HeaderWithAclList; class acl_access; -class header_mangler { +class header_mangler +{ public: acl_access *access_list; char *replacement; diff --git a/src/IoStats.h b/src/IoStats.h index 2329605e8d..0f3353ebd8 100644 --- a/src/IoStats.h +++ b/src/IoStats.h @@ -29,7 +29,8 @@ * */ -class IoStats { +class IoStats +{ public: static const int histSize=16; diff --git a/src/PeerDigest.h b/src/PeerDigest.h index 00df4d02ad..351d5f83eb 100644 --- a/src/PeerDigest.h +++ b/src/PeerDigest.h @@ -38,7 +38,8 @@ /* for CacheDigestGuessStats */ #include "StatCounters.h" -class Version { +class Version +{ public: short int current; /* current version */ short int required; /* minimal version that can safely handle current version */ @@ -60,7 +61,8 @@ public: int reserved[32 - 6]; }; -class DigestFetchState { +class DigestFetchState +{ public: PeerDigest *pd; StoreEntry *entry; diff --git a/src/RefreshPattern.h b/src/RefreshPattern.h index c3abe78246..0d7f9a9ab3 100644 --- a/src/RefreshPattern.h +++ b/src/RefreshPattern.h @@ -29,7 +29,8 @@ * */ -class RefreshPattern { +class RefreshPattern +{ public: const char *pattern; regex_t compiled_pattern; diff --git a/src/RegexList.h b/src/RegexList.h index bbcf6e962c..df2d64b42f 100644 --- a/src/RegexList.h +++ b/src/RegexList.h @@ -29,7 +29,8 @@ * */ -class RegexList { +class RegexList +{ public: int flags; char *pattern; diff --git a/src/RequestFlags.h b/src/RequestFlags.h index 43685e5e8a..6d00b2056e 100644 --- a/src/RequestFlags.h +++ b/src/RequestFlags.h @@ -32,7 +32,8 @@ * */ -class RequestFlags { +class RequestFlags +{ public: RequestFlags(): nocache(false), ims(false), auth_(false), cachable(false), diff --git a/src/SquidConfig.h b/src/SquidConfig.h index 65a6953f7c..278d54dcf3 100644 --- a/src/SquidConfig.h +++ b/src/SquidConfig.h @@ -56,7 +56,8 @@ namespace AnyP { class PortCfg; } -class SquidConfig { +class SquidConfig +{ public: struct { /* These should be for the Store::Root instance. diff --git a/src/SquidList.h b/src/SquidList.h index 58595b8b24..29f712510f 100644 --- a/src/SquidList.h +++ b/src/SquidList.h @@ -32,7 +32,8 @@ * */ -class link_list { +class link_list +{ public: void *ptr; link_list *next; diff --git a/src/acl/AclDenyInfoList.h b/src/acl/AclDenyInfoList.h index 5ee7164f5b..8dd546d8e9 100644 --- a/src/acl/AclDenyInfoList.h +++ b/src/acl/AclDenyInfoList.h @@ -32,7 +32,8 @@ #include "err_type.h" #include "acl/AclNameList.h" -class AclDenyInfoList { +class AclDenyInfoList +{ public: err_type err_page_id; char *err_page_name; diff --git a/src/acl/AclNameList.h b/src/acl/AclNameList.h index c60120dfcb..6f7b08df96 100644 --- a/src/acl/AclNameList.h +++ b/src/acl/AclNameList.h @@ -31,7 +31,8 @@ #include "defines.h" //TODO: convert to a std::list -class AclNameList { +class AclNameList +{ public: char name[ACL_NAME_SZ]; AclNameList *next; diff --git a/src/icmp/net_db.h b/src/icmp/net_db.h index 2c523c2064..54ebc05e01 100644 --- a/src/icmp/net_db.h +++ b/src/icmp/net_db.h @@ -13,14 +13,16 @@ class StoreEntry; class HttpRequest; class netdbEntry; -class net_db_name { +class net_db_name +{ public: hash_link hash; /* must be first */ net_db_name *next; netdbEntry *net_db_entry; }; -class net_db_peer { +class net_db_peer +{ public: const char *peername; double hops; @@ -28,7 +30,8 @@ public: time_t expires; }; -class netdbEntry { +class netdbEntry +{ public: hash_link hash; /* must be first */ char network[MAX_IPSTRLEN]; diff --git a/src/log/CustomLog.h b/src/log/CustomLog.h index f5c1d3bb1d..32a53a1fa4 100644 --- a/src/log/CustomLog.h +++ b/src/log/CustomLog.h @@ -34,7 +34,8 @@ class ACLList; class Logfile; -class CustomLog { +class CustomLog +{ public: char *filename; ACLList *aclList; diff --git a/src/store_rebuild.h b/src/store_rebuild.h index 601b06c373..1d2de170c2 100644 --- a/src/store_rebuild.h +++ b/src/store_rebuild.h @@ -31,7 +31,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -class StoreRebuildData { +class StoreRebuildData +{ public: int objcount; /* # objects successfully reloaded */ int expcount; /* # objects expired */ diff --git a/src/structs.h b/src/structs.h index 658b0a1049..6a1f891d5c 100644 --- a/src/structs.h +++ b/src/structs.h @@ -46,7 +46,8 @@ class ACLChecklist; #if SQUID_SNMP #include "snmp_session.h" -class snmp_request_t { +class snmp_request_t +{ public: u_char *buf; u_char *outbuf; @@ -111,14 +112,16 @@ struct PortCfg; } class SwapDir; -class close_handler { +class close_handler +{ public: PF *handler; void *data; close_handler *next; }; -class dread_ctrl { +class dread_ctrl +{ public: int fd; off_t offset; @@ -129,7 +132,8 @@ public: void *client_data; }; -class dwrite_q { +class dwrite_q +{ public: off_t file_offset; char *buf; @@ -147,7 +151,8 @@ struct _fde_disk { off_t offset; }; -class http_state_flags { +class http_state_flags +{ public: unsigned int proxying:1; unsigned int keepalive:1; @@ -166,14 +171,16 @@ public: unsigned int sentLastChunk:1; ///< do not try to write last-chunk again }; -class domain_ping { +class domain_ping +{ public: char *domain; int do_ping; /* boolean */ domain_ping *next; }; -class domain_type { +class domain_type +{ public: char *domain; peer_t type;