------------------------------------------------------------ revno: 12258 revision-id: kinkie@squid-cache.org-20120807151208-0xmlesd0lsp9tz1d parent: kinkie@squid-cache.org-20120806174108-v2z18lf2n0sooe64 committer: Francesco Chemolli branch nick: trunk timestamp: Tue 2012-08-07 17:12:08 +0200 message: Moved CBDATA_CLASS declarations to the end of classes as per coding guidelines. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kinkie@squid-cache.org-20120807151208-0xmlesd0lsp9tz1d # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 9a91125fa0eba19957c70c133e212af627aa83f1 # timestamp: 2012-08-07 15:51:38 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: kinkie@squid-cache.org-20120806174108-\ # v2z18lf2n0sooe64 # # Begin patch === modified file 'src/DiskIO/AIO/AIODiskFile.h' --- src/DiskIO/AIO/AIODiskFile.h 2010-11-21 04:40:05 +0000 +++ src/DiskIO/AIO/AIODiskFile.h 2012-08-07 15:12:08 +0000 @@ -71,7 +71,6 @@ virtual bool ioInProgress() const; private: - CBDATA_CLASS(AIODiskFile); void error(bool const &); int fd; String path; @@ -79,6 +78,7 @@ RefCount ioRequestor; bool closed; bool error_; + CBDATA_CLASS(AIODiskFile); }; #endif /* USE_DISKIO_AIO */ === modified file 'src/DiskIO/Blocking/BlockingFile.h' --- src/DiskIO/Blocking/BlockingFile.h 2009-01-21 03:47:47 +0000 +++ src/DiskIO/Blocking/BlockingFile.h 2012-08-07 15:12:08 +0000 @@ -62,7 +62,6 @@ private: static DRCB ReadDone; static DWCB WriteDone; - CBDATA_CLASS(BlockingFile); int fd; bool closed; void error (bool const &); @@ -74,6 +73,8 @@ void doClose(); void readDone(int fd, const char *buf, int len, int errflag); void writeDone(int fd, int errflag, size_t len); + + CBDATA_CLASS(BlockingFile); }; #endif /* SQUID_BLOCKINGFILE_H */ === modified file 'src/DiskIO/DiskDaemon/DiskdFile.h' --- src/DiskIO/DiskDaemon/DiskdFile.h 2009-01-21 03:47:47 +0000 +++ src/DiskIO/DiskDaemon/DiskdFile.h 2012-08-07 15:12:08 +0000 @@ -74,7 +74,6 @@ bool errorOccured; DiskdIOStrategy *IO; RefCount ioRequestor; - CBDATA_CLASS(DiskdFile); void openDone(diomsg *); void createDone (diomsg *); void readDone (diomsg *); @@ -86,6 +85,8 @@ void ioAway(); void ioCompleted(); size_t inProgressIOs; + + CBDATA_CLASS(DiskdFile); }; #endif === modified file 'src/DiskIO/DiskThreads/DiskThreadsDiskFile.h' --- src/DiskIO/DiskThreads/DiskThreadsDiskFile.h 2009-01-21 03:47:47 +0000 +++ src/DiskIO/DiskThreads/DiskThreadsDiskFile.h 2012-08-07 15:12:08 +0000 @@ -83,11 +83,12 @@ static AIOCB OpenDone; void openDone(int fd, const char *buf, int aio_return, int aio_errno); RefCount ioRequestor; - CBDATA_CLASS(DiskThreadsDiskFile); void doClose(); void readDone(int fd, const char *buf, int len, int errflag, RefCount request); void writeDone(int fd, int errflag, size_t len, RefCount request); + + CBDATA_CLASS(DiskThreadsDiskFile); }; #include "DiskIO/ReadRequest.h" === modified file 'src/DiskIO/Mmapped/MmappedFile.h' --- src/DiskIO/Mmapped/MmappedFile.h 2011-01-27 21:14:56 +0000 +++ src/DiskIO/Mmapped/MmappedFile.h 2012-08-07 15:12:08 +0000 @@ -26,8 +26,6 @@ virtual bool ioInProgress() const; private: - CBDATA_CLASS(MmappedFile); - char const *path_; RefCount ioRequestor; //RefCount readRequest; @@ -41,6 +39,8 @@ bool error_; void doClose(); + + CBDATA_CLASS(MmappedFile); }; #endif /* SQUID_MMAPPEDFILE_H */ === modified file 'src/MemBuf.h' --- src/MemBuf.h 2009-12-26 00:25:57 +0000 +++ src/MemBuf.h 2012-08-07 15:12:08 +0000 @@ -134,8 +134,6 @@ void grow(mb_size_t min_cap); - CBDATA_CLASS2(MemBuf); - public: /** \deprecated use space*() and content*() methods to access safely instead. @@ -167,6 +165,9 @@ unsigned valid:1; /* to be used for debugging only! */ #endif + +private: + CBDATA_CLASS2(MemBuf); }; #if _USE_INLINE_ === modified file 'src/StoreClient.h' --- src/StoreClient.h 2010-11-27 06:44:33 +0000 +++ src/StoreClient.h 2012-08-07 15:12:08 +0000 @@ -99,7 +99,6 @@ StoreIOBuffer copyInto; private: - CBDATA_CLASS(store_client); void fileRead(); void scheduleDiskRead(); void scheduleMemRead(); @@ -122,6 +121,9 @@ STCB *callback_handler; void *callback_data; } _callback; + +private: + CBDATA_CLASS(store_client); }; SQUIDCEXTERN void storeClientCopy(store_client *, StoreEntry *, StoreIOBuffer, STCB *, void *); === modified file 'src/acl/FilledChecklist.h' --- src/acl/FilledChecklist.h 2012-06-28 18:26:44 +0000 +++ src/acl/FilledChecklist.h 2012-08-07 15:12:08 +0000 @@ -73,18 +73,16 @@ ExternalACLEntry *extacl_entry; private: - CBDATA_CLASS(ACLFilledChecklist); - ConnStateData * conn_; /**< hack for ident and NTLM */ int fd_; /**< may be available when conn_ is not */ bool destinationDomainChecked_; bool sourceDomainChecked_; - -private: /// not implemented; will cause link failures if used ACLFilledChecklist(const ACLFilledChecklist &); /// not implemented; will cause link failures if used ACLFilledChecklist &operator=(const ACLFilledChecklist &); + + CBDATA_CLASS(ACLFilledChecklist); }; /// convenience and safety wrapper for dynamic_cast === modified file 'src/client_side.h' --- src/client_side.h 2012-07-19 00:12:22 +0000 +++ src/client_side.h 2012-08-07 15:12:08 +0000 @@ -147,7 +147,6 @@ void wroteControlMsg(const Comm::ConnectionPointer &conn, char *bufnotused, size_t size, comm_err_t errflag, int xerrno); private: - CBDATA_CLASS(ClientSocketContext); void prepareReply(HttpReply * rep); void packChunk(const StoreIOBuffer &bodyData, MemBuf &mb); void packRange(StoreIOBuffer const &, MemBuf * mb); @@ -159,6 +158,8 @@ bool mayUseConnection_; /* This request may use the connection. Don't read anymore requests for now */ bool connRegistered_; + + CBDATA_CLASS(ClientSocketContext); }; @@ -380,7 +381,6 @@ HttpParser parser_; // XXX: CBDATA plays with public/private and leaves the following 'private' fields all public... :( - CBDATA_CLASS2(ConnStateData); #if USE_SSL bool switchedToHttps_; @@ -401,6 +401,8 @@ AsyncCall::Pointer reader; ///< set when we are reading BodyPipe::Pointer bodyPipe; // set when we are reading request body + + CBDATA_CLASS2(ConnStateData); }; /* convenience class while splitting up body handling */ === modified file 'src/client_side_reply.h' --- src/client_side_reply.h 2012-06-19 21:51:49 +0000 +++ src/client_side_reply.h 2012-08-07 15:12:08 +0000 @@ -120,7 +120,6 @@ clientStreamNode *ourNode; /* This will go away if/when this file gets refactored some more */ private: - CBDATA_CLASS(clientReplyContext); clientStreamNode *getNextNode() const; void makeThisHead(); bool errorInStream(StoreIOBuffer const &result, size_t const &sizeToProcess)const ; @@ -153,6 +152,8 @@ StoreEntry *old_entry; store_client *old_sc; /* ... for entry to be validated */ bool deleting; + + CBDATA_CLASS(clientReplyContext); }; #endif /* SQUID_CLIENTSIDEREPLY_H */ === modified file 'src/client_side_request.h' --- src/client_side_request.h 2012-07-18 16:21:47 +0000 +++ src/client_side_request.h 2012-08-07 15:12:08 +0000 @@ -148,7 +148,6 @@ #endif private: - CBDATA_CLASS(ClientHttpRequest); int64_t maxReplyBodySize_; StoreEntry *entry_; StoreEntry *loggingEntry_; @@ -200,6 +199,9 @@ bool request_satisfaction_mode; int64_t request_satisfaction_offset; #endif + +private: + CBDATA_CLASS(ClientHttpRequest); }; /* client http based routines */ === modified file 'src/esi/Context.h' --- src/esi/Context.h 2009-03-10 20:52:45 +0000 +++ src/esi/Context.h 2012-08-07 15:12:08 +0000 @@ -149,7 +149,6 @@ bool cachedASTInUse; private: - CBDATA_CLASS(ESIContext); void fail (); void freeResources(); void fixupOutboundTail(); @@ -168,6 +167,8 @@ virtual void parserDefault (const char *s, int len); virtual void parserComment (const char *s); bool processing; + + CBDATA_CLASS(ESIContext); }; #endif /* SQUID_ESICONTEXT_H */ === modified file 'src/fs/coss/CossSwapDir.h' --- src/fs/coss/CossSwapDir.h 2011-10-27 23:14:28 +0000 +++ src/fs/coss/CossSwapDir.h 2012-08-07 15:12:08 +0000 @@ -136,13 +136,14 @@ virtual StoreEntry *currentItem(); private: - CBDATA_CLASS2(StoreSearchCoss); RefCount sd; void (*callback)(void *cbdata); void *cbdata; bool _done; dlink_node * current; dlink_node * next_; + + CBDATA_CLASS2(StoreSearchCoss); }; #endif === modified file 'src/fs/ufs/ufscommon.h' --- src/fs/ufs/ufscommon.h 2012-07-20 23:11:02 +0000 +++ src/fs/ufs/ufscommon.h 2012-08-07 15:12:08 +0000 @@ -285,10 +285,11 @@ char *read_buf; private: - CBDATA_CLASS(UFSStoreState); void openDone(); void freePending(); void doWrite(); + + CBDATA_CLASS(UFSStoreState); }; MEMPROXY_CLASS_INLINE(UFSStoreState::_queued_read); @@ -327,12 +328,13 @@ RemovalPolicyWalker *walker; private: + /// \bug (callback) should be hidden behind a proper human readable name + void (callback)(void *cbdata); + void *cbdata; + StoreEntry * current; + bool _done; + CBDATA_CLASS2(StoreSearchUFS); - /// \bug (callback) should be hidden behind a proper human readable name - void (callback)(void *cbdata); - void *cbdata; - StoreEntry * current; - bool _done; }; @@ -402,7 +404,6 @@ struct _store_rebuild_data counts; private: - CBDATA_CLASS2(RebuildState); void rebuildFromDirectory(); void rebuildFromSwapLog(); void rebuildStep(); @@ -416,6 +417,8 @@ /// \bug (callback) should be hidden behind a proper human readable name void (callback)(void *cbdata); void *cbdata; + + CBDATA_CLASS2(RebuildState); }; #if _USE_INLINE_