Cleanup: zap CVS Id tags

[thirdparty/squid.git] / src / StoreIOState.h

diff --git a/src/StoreIOState.h b/src/StoreIOState.h
index aa83eb57c91934482c63356dcbf47c34dd020ae8..c5b1bb02627eb1afbb0d34d61aa477c44f1ef692 100644 (file)
--- a/src/StoreIOState.h
+++ b/src/StoreIOState.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: StoreIOState.h,v 1.7 2006/05/22 19:58:51 wessels Exp $
+ * $Id$
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -19,12 +19,12 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -34,35 +34,7 @@
 #ifndef SQUID_STOREIOSTATE_H
 #define SQUID_STOREIOSTATE_H
 
-/*
- * STRCB is the "store read callback".  STRCB functions are passed
- * to storeRead().  Examples of STRCB callbacks are:
- * storeClientReadBody
- * storeClientReadHeader
- */
-typedef void STRCB(void *their_data, const char *buf, ssize_t len);
-
-/*
- * STFNCB is the "store file number callback."  It is called when
- * an underlying storage module has allocated the swap file number
- * and also indicates that the swap file has been opened for reading
- * or writing.  STFNCB functions are passed to storeCreate() and
- * storeOpen().  Examples of STFNCB callbacks are:
- * storeSwapInFileNotify
- * storeSwapOutFileNotify
- */
-typedef void STFNCB(void *their_data, int errflag);
-
-/*
- * STIOCB is the "store close callback" for store files.  It is
- * called when the store file is closed.  STIOCB functions are
- * passed to storeCreate() and storeOpen(). Examples of STIOCB
- * callbacks are:
- * storeSwapOutFileClosed
- * storeSwapInFileClosed
- */
-typedef void STIOCB(void *their_data, int errflag);
-
+#include "cbdata.h"
 #include "RefCount.h"
 
 class StoreIOState : public RefCountable
@@ -71,6 +43,36 @@ class StoreIOState : public RefCountable
 public:
     typedef RefCount<StoreIOState> Pointer;
 
+    /*
+     * STRCB is the "store read callback".  STRCB functions are
+     * passed to storeRead().  Examples of STRCB callbacks are:
+     * storeClientReadBody
+     * storeClientReadHeader
+     */
+    typedef void STRCB(void *their_data, const char *buf, ssize_t len, StoreIOState::Pointer self);
+
+    /*
+     * STFNCB is the "store file number callback."  It is called
+     * when an underlying storage module has allocated the swap
+     * file number and also indicates that the swap file has been
+     * opened for reading or writing.  STFNCB functions are passed
+     * to storeCreate() and storeOpen().  Examples of STFNCB callbacks
+     * are:
+     * storeSwapInFileNotify
+     * storeSwapOutFileNotify
+     */
+    typedef void STFNCB(void *their_data, int errflag, StoreIOState::Pointer self);
+
+    /*
+     * STIOCB is the "store close callback" for store files.  It
+     * is called when the store file is closed.  STIOCB functions
+     * are passed to storeCreate() and storeOpen(). Examples of
+     * STIOCB callbacks are:
+     * storeSwapOutFileClosed
+     * storeSwapInFileClosed
+     */
+    typedef void STIOCB(void *their_data, int errflag, StoreIOState::Pointer self);
+
     /* StoreIOState does not get mempooled - it's children do */
     void *operator new (size_t amount);
     void operator delete (void *address);
@@ -93,28 +95,20 @@ public:
     STIOCB *callback;
     void *callback_data;
 
-    struct
-    {
+    struct {
         STRCB *callback;
         void *callback_data;
-    }
-
-    read;
-
-    struct
-    {
-
-unsigned int closing:
-        1;     /* debugging aid */
-    }
+    } read;
 
-    flags;
+    struct {
+        unsigned int closing:1;        /* debugging aid */
+    } flags;
 };
 
-StoreIOState::Pointer storeCreate(StoreEntry *, STFNCB *, STIOCB *, void *);
-StoreIOState::Pointer storeOpen(StoreEntry *, STFNCB *, STIOCB *, void *);
+StoreIOState::Pointer storeCreate(StoreEntry *, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *);
+StoreIOState::Pointer storeOpen(StoreEntry *, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *);
 SQUIDCEXTERN void storeClose(StoreIOState::Pointer);
-SQUIDCEXTERN void storeRead(StoreIOState::Pointer, char *, size_t, off_t, STRCB *, void *);
+SQUIDCEXTERN void storeRead(StoreIOState::Pointer, char *, size_t, off_t, StoreIOState::STRCB *, void *);
 SQUIDCEXTERN void storeIOWrite(StoreIOState::Pointer, char const *, size_t, off_t, FREE *);
 
 #endif /* SQUID_STOREIOSTATE_H */