DW:

 - Another case where a size_t variable can be negative.  Use ssize_t
   instead.

diff --git a/src/globals.h b/src/globals.h
index 93c5b1ae3db0c63be80af4a5baba63d3c40c0b33..da90d7c0474ea255c9c08ceff676cb54a70c994b 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: globals.h,v 1.90 2000/05/28 17:00:13 wessels Exp $
+ * $Id: globals.h,v 1.91 2000/05/31 04:26:32 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -153,4 +153,4 @@ extern storefs_entry_t *storefs_list;       /* NULL */
 extern int store_swap_low;     /* 0 */
 extern int store_swap_high;    /* 0 */
 extern int store_pages_max;    /* 0 */
-extern size_t store_maxobjsize;
+extern ssize_t store_maxobjsize; /* -1 */

diff --git a/src/store_swapout.cc b/src/store_swapout.cc
index 948bd57c5efbe1e17b4c57c7acff20667efb1494..7b6263b62dffe1e8c374ec758c03aaaf805ae19e 100644 (file)
--- a/src/store_swapout.cc
+++ b/src/store_swapout.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_swapout.cc,v 1.68 2000/05/29 23:36:23 hno Exp $
+ * $Id: store_swapout.cc,v 1.69 2000/05/31 04:26:32 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager Swapout Functions
  * AUTHOR: Duane Wessels
@@ -102,7 +102,7 @@ storeSwapOut(StoreEntry * e)
     off_t lowest_offset;
     off_t new_mem_lo;
     off_t on_disk = 0;
-    size_t swapout_size;
+    ssize_t swapout_size;
     ssize_t swap_buf_len;
     if (mem == NULL)
        return;
@@ -132,7 +132,7 @@ storeSwapOut(StoreEntry * e)
      * Grab the swapout_size and check to see whether we're going to defer
      * the swapout based upon size
      */
-    swapout_size = (size_t) (mem->inmem_hi - mem->swapout.queue_offset);
+    swapout_size = (ssize_t) (mem->inmem_hi - mem->swapout.queue_offset);
     if ((e->store_status != STORE_OK) && (swapout_size < store_maxobjsize)) {
        debug(20, 5) ("storeSwapOut: Deferring starting swapping out\n");
        return;
@@ -247,7 +247,7 @@ storeSwapOut(StoreEntry * e)
        /* the storeWrite() call might generate an error */
        if (e->swap_status != SWAPOUT_WRITING)
            break;
-       swapout_size = (size_t) (mem->inmem_hi - mem->swapout.queue_offset);
+       swapout_size = (ssize_t) (mem->inmem_hi - mem->swapout.queue_offset);
        if (e->store_status == STORE_PENDING)
            if (swapout_size < SM_PAGE_SIZE)
                break;