Moved CBDATA_CLASS declarations to the end of classes as per coding guidelines.

diff --git a/src/DiskIO/AIO/AIODiskFile.h b/src/DiskIO/AIO/AIODiskFile.h
index 1d5e9a195b6c776f29e334c0ec64a36868319e96..76d06a614b79d773ce4e172c54a67a7653b445f6 100644 (file)
--- a/src/DiskIO/AIO/AIODiskFile.h
+++ b/src/DiskIO/AIO/AIODiskFile.h
@@ -71,7 +71,6 @@ public:
     virtual bool ioInProgress() const;
 
 private:
-    CBDATA_CLASS(AIODiskFile);
     void error(bool const &);
     int fd;
     String path;
@@ -79,6 +78,7 @@ private:
     RefCount<IORequestor> ioRequestor;
     bool closed;
     bool error_;
+    CBDATA_CLASS(AIODiskFile);
 };
 
 #endif /* USE_DISKIO_AIO */

diff --git a/src/DiskIO/Blocking/BlockingFile.h b/src/DiskIO/Blocking/BlockingFile.h
index 6540df2979a87d3bb792966a2dd13b0bf5cf3da7..29c1ca1c45ec673fd7886fc110561473989f56fb 100644 (file)
--- a/src/DiskIO/Blocking/BlockingFile.h
+++ b/src/DiskIO/Blocking/BlockingFile.h
@@ -62,7 +62,6 @@ public:
 private:
     static DRCB ReadDone;
     static DWCB WriteDone;
-    CBDATA_CLASS(BlockingFile);
     int fd;
     bool closed;
     void error (bool const &);
@@ -74,6 +73,8 @@ private:
     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 */

diff --git a/src/DiskIO/DiskDaemon/DiskdFile.h b/src/DiskIO/DiskDaemon/DiskdFile.h
index f266164a3607d7d30d7c3501d5b25dc0c38015c2..e0278446aac48606d34bc37c3f16a3113f1e95eb 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdFile.h
+++ b/src/DiskIO/DiskDaemon/DiskdFile.h
@@ -74,7 +74,6 @@ private:
     bool errorOccured;
     DiskdIOStrategy *IO;
     RefCount<IORequestor> ioRequestor;
-    CBDATA_CLASS(DiskdFile);
     void openDone(diomsg *);
     void createDone (diomsg *);
     void readDone (diomsg *);
@@ -86,6 +85,8 @@ private:
     void ioAway();
     void ioCompleted();
     size_t inProgressIOs;
+
+    CBDATA_CLASS(DiskdFile);
 };
 
 #endif

diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
index 3642248f5527184d79f9b9e6dbe51aefd5f17bf4..0225ef096089a836bef041f48cdf1dfc28c6373e 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
@@ -83,11 +83,12 @@ private:
     static AIOCB OpenDone;
     void openDone(int fd, const char *buf, int aio_return, int aio_errno);
     RefCount<IORequestor> ioRequestor;
-    CBDATA_CLASS(DiskThreadsDiskFile);
     void doClose();
 
     void readDone(int fd, const char *buf, int len, int errflag, RefCount<ReadRequest> request);
     void writeDone(int fd, int errflag, size_t len, RefCount<WriteRequest> request);
+
+    CBDATA_CLASS(DiskThreadsDiskFile);
 };
 
 #include "DiskIO/ReadRequest.h"

diff --git a/src/DiskIO/Mmapped/MmappedFile.h b/src/DiskIO/Mmapped/MmappedFile.h
index 6d1737755a1642f8bc5b85793e67e447b63e7a11..128ea3c6df70dbe90deaa7e720377227d8d2f08c 100644 (file)
--- a/src/DiskIO/Mmapped/MmappedFile.h
+++ b/src/DiskIO/Mmapped/MmappedFile.h
@@ -26,8 +26,6 @@ public:
     virtual bool ioInProgress() const;
 
 private:
-    CBDATA_CLASS(MmappedFile);
-
     char const *path_;
     RefCount<IORequestor> ioRequestor;
     //RefCount<ReadRequest> readRequest;
@@ -41,6 +39,8 @@ private:
     bool error_;
 
     void doClose();
+
+    CBDATA_CLASS(MmappedFile);
 };
 
 #endif /* SQUID_MMAPPEDFILE_H */

diff --git a/src/MemBuf.h b/src/MemBuf.h
index c682a7bdf020a4246b6c7c77942f61b8ff42b1e5..4f6ea782976b2811db2d485ec384bc3e10b2e908 100644 (file)
--- a/src/MemBuf.h
+++ b/src/MemBuf.h
@@ -134,8 +134,6 @@ private:
 
     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 @@ public:
 
     unsigned valid:1;          /* to be used for debugging only! */
 #endif
+
+private:
+    CBDATA_CLASS2(MemBuf);
 };
 
 #if _USE_INLINE_

diff --git a/src/StoreClient.h b/src/StoreClient.h
index db1aee6110318cffe726dcb3fdd4fe9f5b5dd010..8749ed1b0a561d4064902a8f4d48b9bcf0ed365c 100644 (file)
--- a/src/StoreClient.h
+++ b/src/StoreClient.h
@@ -99,7 +99,6 @@ public:
     StoreIOBuffer copyInto;
 
 private:
-    CBDATA_CLASS(store_client);
     void fileRead();
     void scheduleDiskRead();
     void scheduleMemRead();
@@ -122,6 +121,9 @@ public:
         STCB *callback_handler;
         void *callback_data;
     } _callback;
+
+private:
+    CBDATA_CLASS(store_client);
 };
 
 SQUIDCEXTERN void storeClientCopy(store_client *, StoreEntry *, StoreIOBuffer, STCB *, void *);

diff --git a/src/acl/FilledChecklist.h b/src/acl/FilledChecklist.h
index 968bf2bd89291c8fe9773c9c7847e7d092f271b8..dbc297de370e5e868b134933e4417e13023cd63e 100644 (file)
--- a/src/acl/FilledChecklist.h
+++ b/src/acl/FilledChecklist.h
@@ -73,18 +73,16 @@ public:
     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<ACLFilledChecklist*>

diff --git a/src/client_side.h b/src/client_side.h
index 50a80c25fe7dd30a5e438c78787b9e768e2ac3bf..6713da50f92053f8b76d817f406832e1c3a77f27 100644 (file)
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -147,7 +147,6 @@ protected:
     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 @@ private:
 
     bool mayUseConnection_; /* This request may use the connection. Don't read anymore requests for now */
     bool connRegistered_;
+
+    CBDATA_CLASS(ClientSocketContext);
 };
 
 
@@ -380,7 +381,6 @@ private:
     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 @@ private:
 
     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 */

diff --git a/src/client_side_reply.h b/src/client_side_reply.h
index 26d9d11d057fe4cf1ff761a782c004d0a791f1a3..a0639940014b22b4a773f1b704ed4e9d53fcc75c 100644 (file)
--- a/src/client_side_reply.h
+++ b/src/client_side_reply.h
@@ -120,7 +120,6 @@ public:
     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 @@ private:
     StoreEntry *old_entry;
     store_client *old_sc;      /* ... for entry to be validated */
     bool deleting;
+
+    CBDATA_CLASS(clientReplyContext);
 };
 
 #endif /* SQUID_CLIENTSIDEREPLY_H */

diff --git a/src/client_side_request.h b/src/client_side_request.h
index bdf3c091488aec844dc43623c62546385684a72b..517ee698b3d48aba3efacca811a33ce4829059b1 100644 (file)
--- a/src/client_side_request.h
+++ b/src/client_side_request.h
@@ -148,7 +148,6 @@ public:
 #endif
 
 private:
-    CBDATA_CLASS(ClientHttpRequest);
     int64_t maxReplyBodySize_;
     StoreEntry *entry_;
     StoreEntry *loggingEntry_;
@@ -200,6 +199,9 @@ private:
     bool request_satisfaction_mode;
     int64_t request_satisfaction_offset;
 #endif
+
+private:
+    CBDATA_CLASS(ClientHttpRequest);
 };
 
 /* client http based routines */

diff --git a/src/esi/Context.h b/src/esi/Context.h
index bf958dc59e9f59044fb5a55636b7e222398e9202..3294435eb82d66244f2b30a17c9a9fd72433635b 100644 (file)
--- a/src/esi/Context.h
+++ b/src/esi/Context.h
@@ -149,7 +149,6 @@ public:
     bool cachedASTInUse;
 
 private:
-    CBDATA_CLASS(ESIContext);
     void fail ();
     void freeResources();
     void fixupOutboundTail();
@@ -168,6 +167,8 @@ private:
     virtual void parserDefault (const char *s, int len);
     virtual void parserComment (const char *s);
     bool processing;
+
+    CBDATA_CLASS(ESIContext);
 };
 
 #endif /* SQUID_ESICONTEXT_H */

diff --git a/src/fs/coss/CossSwapDir.h b/src/fs/coss/CossSwapDir.h
index 8279d27c49d9ec3e2d693f0f4bf3df5bdd34c16f..642b27ce4c52c06b76670e756d08e33fa956646a 100644 (file)
--- a/src/fs/coss/CossSwapDir.h
+++ b/src/fs/coss/CossSwapDir.h
@@ -136,13 +136,14 @@ public:
     virtual StoreEntry *currentItem();
 
 private:
-    CBDATA_CLASS2(StoreSearchCoss);
     RefCount<CossSwapDir> sd;
     void (*callback)(void *cbdata);
     void *cbdata;
     bool _done;
     dlink_node * current;
     dlink_node * next_;
+
+    CBDATA_CLASS2(StoreSearchCoss);
 };
 
 #endif

diff --git a/src/fs/ufs/ufscommon.h b/src/fs/ufs/ufscommon.h
index 0ddde259673183ed504a18203848f3ab35bc3df2..578af1f10ffd7bd2a4fd1e64304ba1b33d035b55 100644 (file)
--- a/src/fs/ufs/ufscommon.h
+++ b/src/fs/ufs/ufscommon.h
@@ -285,10 +285,11 @@ protected:
     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 @@ public:
     RemovalPolicyWalker *walker;
 
 private:
-    CBDATA_CLASS2(StoreSearchUFS);
     /// \bug (callback) should be hidden behind a proper human readable name
     void (callback)(void *cbdata);
     void *cbdata;
     StoreEntry * current;
     bool _done;
+
+    CBDATA_CLASS2(StoreSearchUFS);
 };
 
 
@@ -402,7 +404,6 @@ public:
     struct _store_rebuild_data counts;
 
 private:
-    CBDATA_CLASS2(RebuildState);
     void rebuildFromDirectory();
     void rebuildFromSwapLog();
     void rebuildStep();
@@ -416,6 +417,8 @@ private:
     /// \bug (callback) should be hidden behind a proper human readable name
     void (callback)(void *cbdata);
     void *cbdata;
+
+    CBDATA_CLASS2(RebuildState);
 };
 
 #if _USE_INLINE_