Moved DigestFetchState cbdata definition to peer_digest.c and deleted

the old no longer used MEM_DIGEST_FETCH_STATE mempool.

diff --git a/src/cbdata.cc b/src/cbdata.cc
index fbcdf286cde90bcfd7e4158e5d85ce0050851fb1..f89ef4e5fbd4df836b5ab772059ddcc20cea8152 100644 (file)
--- a/src/cbdata.cc
+++ b/src/cbdata.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cbdata.cc,v 1.40 2001/04/04 00:42:36 wessels Exp $
+ * $Id: cbdata.cc,v 1.41 2001/04/09 21:55:50 hno Exp $
  *
  * DEBUG: section 45    Callback Data Registry
  * ORIGINAL AUTHOR: Duane Wessels
@@ -136,7 +136,6 @@ cbdataInit(void)
     CREATE_CBDATA(aclCheck_t);
     CREATE_CBDATA(clientHttpRequest);
     CREATE_CBDATA(ConnStateData);
-    CREATE_CBDATA(DigestFetchState);
     CREATE_CBDATA(ErrorState);
     CREATE_CBDATA(FwdState);
     CREATE_CBDATA(generic_cbdata);

diff --git a/src/enums.h b/src/enums.h
index 783fb8adac0d93e62f6c60e342a820dfabd3ca98..00cf77e244d6e1af3cfd30281a6a3115284509a4 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.188 2001/03/03 10:39:31 hno Exp $
+ * $Id: enums.h,v 1.189 2001/04/09 21:55:50 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -573,9 +573,6 @@ typedef enum {
     MEM_CLOSE_HANDLER,
     MEM_COMMWRITESTATEDATA,
     MEM_CONNSTATEDATA,
-#if USE_CACHE_DIGESTS
-    MEM_DIGEST_FETCH_STATE,
-#endif
     MEM_LINK_LIST,
     MEM_DLINK_LIST,
     MEM_DLINK_NODE,

diff --git a/src/mem.cc b/src/mem.cc
index 771209c0dbdce4872fcb655b3c5794dfb6f112ac..6e6481986c54ce2e5849a257c4f8c3e36b687a61 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: mem.cc,v 1.55 2001/02/17 07:28:50 hno Exp $
+ * $Id: mem.cc,v 1.56 2001/04/09 21:55:50 hno Exp $
  *
  * DEBUG: section 13    High Level Memory Pool Management
  * AUTHOR: Harvest Derived
@@ -223,9 +223,6 @@ memInit(void)
     memDataInit(MEM_COMMWRITESTATEDATA, "CommWriteStateData",
        sizeof(CommWriteStateData), 0);
     memDataInit(MEM_CONNSTATEDATA, "ConnStateData", sizeof(ConnStateData), 0);
-#if USE_CACHE_DIGESTS
-    memDataInit(MEM_DIGEST_FETCH_STATE, "DigestFetchState", sizeof(DigestFetchState), 0);
-#endif
     memDataInit(MEM_LINK_LIST, "link_list", sizeof(link_list), 10);
     memDataInit(MEM_DLINK_LIST, "dlink_list", sizeof(dlink_list), 10);
     memDataInit(MEM_DLINK_NODE, "dlink_node", sizeof(dlink_node), 10);
@@ -264,7 +261,6 @@ memInit(void)
     memDataInit(MEM_PEER, "peer", sizeof(peer), 0);
 #if USE_CACHE_DIGESTS
     memDataInit(MEM_PEER_DIGEST, "PeerDigest", sizeof(PeerDigest), 0);
-    memDataInit(MEM_DIGEST_FETCH_STATE, "DigestFetchState", sizeof(DigestFetchState), 0);
 #endif
 #if USE_ICMP
     memDataInit(MEM_PINGERECHODATA, "pingerEchoData",

diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index 033e62c2e94e4635662e4531a47c6559933bec20..6c3563377d58dc7d227365f0da3bb661798af88d 100644 (file)
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_digest.cc,v 1.79 2001/03/03 10:39:33 hno Exp $
+ * $Id: peer_digest.cc,v 1.80 2001/04/09 21:55:50 hno Exp $
  *
  * DEBUG: section 72    Peer Digest Routines
  * AUTHOR: Alex Rousskov
@@ -262,6 +262,8 @@ peerDigestCheck(void *data)
        peerDigestSetCheck(pd, req_time - squid_curtime);
 }
 
+CBDATA_TYPE(DigestFetchState);
+
 /* ask store for a digest */
 static void
 peerDigestRequest(PeerDigest * pd)
@@ -295,6 +297,7 @@ peerDigestRequest(PeerDigest * pd)
     if (p->login)
        xstrncpy(req->login, p->login, MAX_LOGIN_SZ);
     /* create fetch state structure */
+    CBDATA_INIT_TYPE(DigestFetchState);
     fetch = cbdataAlloc(DigestFetchState);
     fetch->request = requestLink(req);
     fetch->pd = pd;