From: wessels <>
Date: Wed, 16 Dec 1998 12:38:57 +0000 (+0000)
Subject: more cases where it is wrong to call cbdataValid
X-Git-Tag: SQUID_3_0_PRE1~2456
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5385c86ac78f3bc9b7eab7d75d8923bc8292e5f4;p=thirdparty%2Fsquid.git

more cases where it is wrong to call cbdataValid
---

diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index 016227565f..db40e2d45e 100644
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_digest.cc,v 1.67 1998/12/16 05:21:37 wessels Exp $
+ * $Id: peer_digest.cc,v 1.68 1998/12/16 05:38:57 wessels Exp $
  *
  * DEBUG: section 72    Peer Digest Routines
  * AUTHOR: Alex Rousskov
@@ -103,7 +103,6 @@ peerDigestCreate(peer * p)
 {
     PeerDigest *pd;
     assert(p);
-    /* cannot check cbdataValid(p) because p may not be locked yet */
 
     pd = memAllocate(MEM_PEER_DIGEST);
     cbdataAdd(pd, memFree, MEM_PEER_DIGEST);
@@ -119,7 +118,6 @@ peerDigestDestroy(PeerDigest * pd)
 {
     peer *p;
     assert(pd);
-    assert(cbdataValid(pd));
 
     p = pd->peer;
     pd->peer = NULL;
@@ -196,17 +194,19 @@ peerDigestSetCheck(PeerDigest * pd, time_t delay)
 	strBuf(pd->host), delay);
 }
 
-/* called only when cbdataValid(pd) and
- * peer is about to disappear or have already disappeared */
+/*
+ * called when peer is about to disappear or have already disappeared
+ */
 void
 peerDigestNotePeerGone(PeerDigest * pd)
 {
-    assert(cbdataValid(pd));
     if (pd->flags.requested) {
-	debug(72, 2) ("peerDigest: peer %s is gone, will destroy after fetch.\n", strBuf(pd->host));
+	debug(72, 2) ("peerDigest: peer %s gone, will destroy after fetch.\n",
+	    strBuf(pd->host));
 	/* do nothing now, the fetching chain will notice and take action */
     } else {
-	debug(72, 2) ("peerDigest: peer %s is gone, destroying now.\n", strBuf(pd->host));
+	debug(72, 2) ("peerDigest: peer %s is gone, destroying now.\n",
+	    strBuf(pd->host));
 	peerDigestDestroy(pd);
     }
 }
@@ -522,8 +522,10 @@ peerDigestFetchedEnough(DigestFetchState * fetch, char *buf, ssize_t size, const
 	    reason = "fetch aborted?!";
 	else if (!(pd = fetch->pd))
 	    reason = "peer digest disappeared?!";
+#if DONT
 	else if (!cbdataValid(pd))
 	    reason = "invalidated peer digest?!";
+#endif
 	else
 	    host = strBuf(pd->host);
     }