From: hno <>
Date: Thu, 18 Apr 2002 03:53:26 +0000 (+0000)
Subject: Corrected a merge conflict from the cbdata branch.
X-Git-Tag: SQUID_3_0_PRE1~1057
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b9d81a40e5e398ff65556ead678744d5420b1e4;p=thirdparty%2Fsquid.git

Corrected a merge conflict from the cbdata branch.
---

diff --git a/src/net_db.cc b/src/net_db.cc
index 53282b77c1..6e3a453d8b 100644
--- a/src/net_db.cc
+++ b/src/net_db.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: net_db.cc,v 1.160 2002/04/13 23:07:51 hno Exp $
+ * $Id: net_db.cc,v 1.161 2002/04/17 21:53:26 hno Exp $
  *
  * DEBUG: section 38    Network Measurement Database
  * AUTHOR: Duane Wessels
@@ -564,8 +564,6 @@ netdbExchangeHandleReply(void *data, char *notused, ssize_t retsize)
     rec_sz += 1 + sizeof(addr.s_addr);
     rec_sz += 1 + sizeof(int);
     rec_sz += 1 + sizeof(int);
-    ex->seen = ex->used + size;
-    debug(38, 3) ("netdbExchangeHandleReply: %d bytes\n", (int) size);
     debug(38, 3) ("netdbExchangeHandleReply: %d read bytes\n", (int) retsize);
     if (!cbdataReferenceValid(ex->p)) {
 	debug(38, 3) ("netdbExchangeHandleReply: Peer became invalid\n");