From: wessels <>
Date: Fri, 17 Oct 1997 10:00:10 +0000 (+0000)
Subject: - removed ERR_NO_CLIENTS because its not needed any longer
X-Git-Tag: SQUID_3_0_PRE1~4789
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88eb862c78dec59611fd51b6c9459707fcc3762c;p=thirdparty%2Fsquid.git

- removed ERR_NO_CLIENTS because its not needed any longer
- Fixed new swap out scheme.  'swapout.offset' should have been 'lowest_offset'
---

diff --git a/src/enums.h b/src/enums.h
index 3eedb08b00..b232f87325 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -22,7 +22,6 @@ typedef enum {
 
 typedef enum {
     ERR_NONE,
-    ERR_NO_CLIENTS,
     ERR_READ_TIMEOUT,
     ERR_LIFETIME_EXP,
     ERR_READ_ERROR,
diff --git a/src/errorpage.cc b/src/errorpage.cc
index 2fa0660ce7..7b718e1a81 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: errorpage.cc,v 1.75 1997/10/17 00:00:35 wessels Exp $
+ * $Id: errorpage.cc,v 1.76 1997/10/17 04:00:11 wessels Exp $
  *
  * DEBUG: section 4     Error Generation
  * AUTHOR: Duane Wessels
@@ -34,7 +34,6 @@
 const char *err_string[] =
 {
     "ERR_NONE",
-    "ERR_NO_CLIENTS",
     "ERR_READ_TIMEOUT",
     "ERR_LIFETIME_EXP",
     "ERR_READ_ERROR",
diff --git a/src/store.cc b/src/store.cc
index 79349d2676..9be5162e08 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.287 1997/10/17 00:00:47 wessels Exp $
+ * $Id: store.cc,v 1.288 1997/10/17 04:00:12 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -516,6 +516,8 @@ storeUnlockObject(StoreEntry * e)
     if (BIT_TEST(e->flag, RELEASE_REQUEST))
 	storeRelease(e);
     else if (storeKeepInMemory(e)) {
+	debug(0,0)("storeUnlockObject: %s has %d bytes in memory\n",
+		e->url, (int) (e->mem_obj->inmem_hi - e->mem_obj->inmem_lo));
 	storeSetMemStatus(e, IN_MEMORY);
 	requestUnlink(e->mem_obj->request);
 	e->mem_obj->request = NULL;
@@ -948,7 +950,7 @@ storeCheckSwapOut(StoreEntry * e)
     assert(mem->inmem_lo <= mem->swapout.offset);
     lowest_offset = storeLowestMemReaderOffset(e);
     debug(20, 3) ("storeCheckSwapOut: lowest_offset = %d\n", (int) lowest_offset);
-    copy_size = (size_t) (mem->swapout.offset - mem->inmem_lo);
+    copy_size = (size_t) (lowest_offset - mem->inmem_lo);
     debug(20, 3) ("storeCheckSwapOut: copy_size = %d\n", (int) copy_size);
     assert(copy_size >= 0);
     if (copy_size == 0)
@@ -2698,6 +2700,7 @@ storeInMemAdd(StoreEntry * e)
 {
     struct _mem_entry *m = xmalloc(sizeof(struct _mem_entry));
     debug(0, 0) ("storeInMemAdd: %s\n", e->url);
+    assert(e->mem_obj->inmem_lo == 0);
     m->e = e;
     m->prev = NULL;
     m->next = inmem_head;