From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sat, 31 Jul 2010 14:38:47 +0000 (-0600)
Subject: Make memory_pools_limit an int64_t to handle signed "none" values.
X-Git-Tag: SQUID_3_1_6~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14e9deba5a310b23753b411732cfdc2e8c81c836;p=thirdparty%2Fsquid.git

Make memory_pools_limit an int64_t to handle signed "none" values.
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index cd16b06a70..805f8e2494 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -6320,7 +6320,7 @@ DOC_END
 
 NAME: memory_pools_limit
 COMMENT: (bytes)
-TYPE: b_size_t
+TYPE: b_int64_t
 DEFAULT: 5 MB
 LOC: Config.MemPools.limit
 DOC_START
@@ -6339,7 +6339,7 @@ DOC_START
 	will be no limit on the total amount of memory used for safe-keeping.
 
 	To disable memory allocation optimization, do not set
-	memory_pools_limit to 0. Set memory_pools to "off" instead.
+	memory_pools_limit to 0 or none. Set memory_pools to "off" instead.
 
 	An overhead for maintaining memory pools is not taken into account
 	when the limit is checked. This overhead is close to four bytes per
diff --git a/src/mem.cc b/src/mem.cc
index 359903ea97..a3534fb8d0 100644
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -346,7 +346,7 @@ Mem::CleanIdlePools(void *unused)
 void
 memConfigure(void)
 {
-    ssize_t new_pool_limit;
+    int64_t new_pool_limit;
 
     /** Set to configured value first */
     if (!Config.onoff.mem_pools)
diff --git a/src/structs.h b/src/structs.h
index 0f88b8b76c..493f822e05 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -530,7 +530,7 @@ struct SquidConfig {
     } retry;
 
     struct {
-        size_t limit;
+        int64_t limit;
     } MemPools;
 #if DELAY_POOLS