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 cd16b06a70ed3bc0eca8410534212950fdd46521..805f8e24941d06f8301f042356aa20f129f99fba 100644 (file)
--- 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 359903ea97b9f545ac8fd46c8852a56ddb03409a..a3534fb8d0223387a5427477a061d0670a032c23 100644 (file)
--- 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 0f88b8b76c765ac6db89b27b3d18ff64abaede13..493f822e050a4074a8af9c7bbde6da56513f7359 100644 (file)
--- 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