------------------------------------------------------------ revno: 12340 revision-id: squidadm@squid-cache.org-20121004002344-7n75j2lm9b38dehw parent: kinkie@squid-cache.org-20121003170734-66s13629do10m0ku committer: Automatic source maintenance branch nick: trunk timestamp: Wed 2012-10-03 18:23:44 -0600 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20121004002344-\ # 7n75j2lm9b38dehw # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 7b2ac3fdce6dbd04a529b023a969794c547d2e82 # timestamp: 2012-10-04 00:53:14 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: kinkie@squid-cache.org-20121003170734-\ # 66s13629do10m0ku # # Begin patch === modified file 'src/CacheManager.h' --- src/CacheManager.h 2012-09-23 09:04:21 +0000 +++ src/CacheManager.h 2012-10-04 00:23:44 +0000 @@ -50,7 +50,8 @@ */ class HttpRequest; -namespace Mgr { +namespace Mgr +{ class ActionPasswordList; } //namespace Mgr /** === modified file 'src/SnmpRequest.h' --- src/SnmpRequest.h 2012-09-22 15:07:57 +0000 +++ src/SnmpRequest.h 2012-10-04 00:23:44 +0000 @@ -1,8 +1,8 @@ #ifndef SQUID_SNMPREQUEST_H_ #define SQUID_SNMPREQUEST_H_ /* - * DEBUG: section - * AUTHOR: + * DEBUG: section + * AUTHOR: * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/SquidConfig.h' --- src/SquidConfig.h 2012-09-25 15:36:18 +0000 +++ src/SquidConfig.h 2012-10-04 00:23:44 +0000 @@ -48,7 +48,8 @@ class acl_access; class AclSizeLimit; class AclDenyInfoList; -namespace Mgr { +namespace Mgr +{ class ActionPasswordList; } // namespace Mgr class CustomLog; @@ -59,7 +60,8 @@ class RemovalPolicySettings; class SwapDir; -namespace AnyP { +namespace AnyP +{ class PortCfg; } === modified file 'src/acl/AclSizeLimit.h' --- src/acl/AclSizeLimit.h 2012-09-25 15:36:18 +0000 +++ src/acl/AclSizeLimit.h 2012-10-04 00:23:44 +0000 @@ -32,7 +32,8 @@ class ACLList; /// representation of a class of Size-limit ACLs // a POD. TODO: convert to new ACL framework -class AclSizeLimit { +class AclSizeLimit +{ public: AclSizeLimit *next; ACLList *aclList; === modified file 'src/client_db.h' --- src/client_db.h 2012-09-21 14:57:30 +0000 +++ src/client_db.h 2012-10-04 00:23:44 +0000 @@ -36,7 +36,8 @@ #include "anyp/ProtocolType.h" #include "enums.h" #include "ip/Address.h" -namespace Ip { +namespace Ip +{ class Address; } === modified file 'src/client_side.cc' --- src/client_side.cc 2012-10-03 07:34:10 +0000 +++ src/client_side.cc 2012-10-04 00:23:44 +0000 @@ -2656,7 +2656,7 @@ request->flags.ignoreCc = conn->port->ignore_cc; // TODO: decouple http->flags.accel from request->flags.sslBumped request->flags.noDirect = (request->flags.accelerated && !request->flags.sslBumped) ? - !conn->port->allow_direct : 0; + !conn->port->allow_direct : 0; #if USE_AUTH if (request->flags.sslBumped) { if (conn->auth_user_request != NULL) === modified file 'src/client_side.h' --- src/client_side.h 2012-09-21 14:57:30 +0000 +++ src/client_side.h 2012-10-04 00:23:44 +0000 @@ -53,8 +53,9 @@ class ClientHttpRequest; class clientStreamNode; class ChunkedCodingParser; -namespace AnyP { - class PortCfg; +namespace AnyP +{ +class PortCfg; } // namespace Anyp /** === modified file 'src/comm.h' --- src/comm.h 2012-09-21 14:57:30 +0000 +++ src/comm.h 2012-10-04 00:23:44 +0000 @@ -8,7 +8,8 @@ #include "comm/IoCallback.h" #include "StoreIOBuffer.h" -namespace Ip { +namespace Ip +{ class Address; } === modified file 'src/fde.h' --- src/fde.h 2012-09-25 15:36:18 +0000 +++ src/fde.h 2012-10-04 00:23:44 +0000 @@ -44,7 +44,8 @@ class PconnPool; class dwrite_q; -class _fde_disk { +class _fde_disk +{ public: DWCB *wrt_handle; void *wrt_handle_data; === modified file 'src/ip/QosConfig.h' --- src/ip/QosConfig.h 2012-09-25 15:36:18 +0000 +++ src/ip/QosConfig.h 2012-10-04 00:23:44 +0000 @@ -22,7 +22,8 @@ // TODO: move to new ACL framework // not integrated in namespace, as this class uses a strange CBDATA definition // POD -class acl_tos { +class acl_tos +{ public: acl_tos *next; ACLList *aclList; @@ -31,7 +32,8 @@ // TODO: move to new ACL framework // not integrated in namespace, as this class uses a strange CBDATA definition // POD -class acl_nfmark { +class acl_nfmark +{ public: acl_nfmark *next; ACLList *aclList; === modified file 'src/log/CustomLog.h' --- src/log/CustomLog.h 2012-09-21 13:27:44 +0000 +++ src/log/CustomLog.h 2012-10-04 00:23:44 +0000 @@ -33,7 +33,8 @@ class ACLList; class Logfile; -namespace Format { +namespace Format +{ class Format; } === modified file 'src/mgr/ActionPasswordList.h' --- src/mgr/ActionPasswordList.h 2012-09-21 13:27:44 +0000 +++ src/mgr/ActionPasswordList.h 2012-10-04 00:23:44 +0000 @@ -31,7 +31,8 @@ class wordlist; -namespace Mgr { +namespace Mgr +{ //TODO: refactor into a std::list /// list of cachemgr password authorization definitions. Currently a POD. class ActionPasswordList === modified file 'src/neighbors.h' --- src/neighbors.h 2012-09-21 13:27:44 +0000 +++ src/neighbors.h 2012-10-04 00:23:44 +0000 @@ -48,11 +48,11 @@ CachePeer *getSingleParent(HttpRequest *); int neighborsCount(HttpRequest *); int neighborsUdpPing(HttpRequest *, - StoreEntry *, - IRCB * callback, - void *data, - int *exprep, - int *timeout); + StoreEntry *, + IRCB * callback, + void *data, + int *exprep, + int *timeout); void neighborAddAcl(const char *, const char *); void neighborsUdpAck(const cache_key *, icp_common_t *, const Ip::Address &); === modified file 'src/ssl/ProxyCerts.h' --- src/ssl/ProxyCerts.h 2012-09-23 10:30:46 +0000 +++ src/ssl/ProxyCerts.h 2012-10-04 00:23:44 +0000 @@ -32,14 +32,16 @@ #if USE_SSL class ACLList; -class sslproxy_cert_sign { +class sslproxy_cert_sign +{ public: int alg; ACLList *aclList; sslproxy_cert_sign *next; }; -class sslproxy_cert_adapt { +class sslproxy_cert_adapt +{ public: int alg; char *param;