fix some parsing. Needed regular 'parse_size_t' different than one

for parsing "bytes" spec.
Also fixed initialization for sendSignal()

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index a1b7f58e5987324bf1f6eacb47d4a2c5a8ce749e..edba0ae04b5d93b4343f667153a241cdbb1a4aef 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_cf.cc,v 1.214 1997/07/17 05:21:32 wessels Exp $
+ * $Id: cache_cf.cc,v 1.215 1997/07/19 02:56:35 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -792,7 +792,6 @@ parse_int(int *var)
 {
     char *token;
     int i;
-
     GetInteger(i);
     *var = i;
 }
@@ -985,6 +984,12 @@ free_time_t(time_t * var)
 
 static void
 dump_size_t(size_t var)
+{
+    printf("%d", (int) var);
+}
+
+static void
+dump_b_size_t(size_t var)
 {
     printf("%d bytes", (int) var);
 }
@@ -997,6 +1002,15 @@ dump_kb_size_t(size_t var)
 
 static void
 parse_size_t(size_t * var)
+{
+    char *token;
+    int i;
+    GetInteger(i);
+    *var = (size_t) i;
+}
+
+static void
+parse_b_size_t(size_t * var)
 {
     parseBytesLine(var, B_BYTES_STR);
 }
@@ -1013,6 +1027,7 @@ free_size_t(size_t * var)
     *var = 0;
 }
 
+#define free_b_size_t free_size_t
 #define free_kb_size_t free_size_t
 #define free_mb_size_t free_size_t
 #define free_gb_size_t free_size_t

diff --git a/src/cbdata.cc b/src/cbdata.cc
index 4838cda3b29fcb9a966f5bb48d5795334a923776..5e9d79a4e13b5184b8d6e6eb7c999003db44e1c5 100644 (file)
--- a/src/cbdata.cc
+++ b/src/cbdata.cc
@@ -41,6 +41,7 @@ cbdataAdd(void *p)
     cbdata *c;
     assert(p);
     debug(45, 3) ("cbdataAdd: %p\n", p);
+    assert(htable != NULL);
     assert(hash_lookup(htable, p) == NULL);
     c = xcalloc(1, sizeof(cbdata));
     c->key = p;

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 983b2c2f79c54373c5aa542d73bb766795db40c4..b16e3a092cdc5f81d25bd6d0c26cb81d69f6b432 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -358,7 +358,7 @@ DOC_END
 
 NAME: cache_mem
 COMMENT: (bytes)
-TYPE: size_t
+TYPE: b_size_t
 DEFAULT: 8 MB
 LOC: Config.Mem.maxSize
 DOC_START
@@ -438,7 +438,7 @@ DOC_END
 
 NAME: maximum_object_size
 COMMENT: (bytes)
-TYPE: size_t
+TYPE: b_size_t
 DEFAULT: 4096 KB
 LOC: Config.Store.maxObjectSize
 DOC_START
@@ -715,7 +715,7 @@ ftp_user squid@
 DOC_END
 
 NAME: ftp_list_width
-TYPE: int
+TYPE: size_t
 DEFAULT: 32
 LOC: Config.Ftp.list_width
 DOC_START
@@ -1458,7 +1458,7 @@ DOC_END
 
 NAME: tcp_recv_bufsize
 COMMENT: (bytes)
-TYPE: size_t
+TYPE: b_size_t
 DEFAULT: 0 bytes
 LOC: Config.tcpRcvBufsz
 DOC_START
@@ -1546,7 +1546,7 @@ DOC_END
 
 NAME: udp_hit_obj_size
 COMMENT: (bytes)
-TYPE: size_t
+TYPE: b_size_t
 LOC: Config.udpMaxHitObjsz
 DEFAULT: 0 bytes
 DOC_START

diff --git a/src/defines.h b/src/defines.h
index 4e150497fb4f81f2350278a088cdbf3a38304401..d1052a79ace20182ab3e609f0db1c1e1afc76661 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -97,7 +97,7 @@
 #undef  HASH_SIZE 65357                /* prime number < 65536 */
 #endif
 
-#define  HASH_SIZE 7951                /* prime number < 8192 */
+#define  DEFAULT_HASH_SIZE 7951                /* prime number < 8192 */
 
 #define HTTP_REPLY_FIELD_SZ 128
 

diff --git a/src/main.cc b/src/main.cc
index 1e5088b177b2245e2dfd87d9f44633b33f6e8c67..cc6fc605d965dad1ee206fae9cf616ce4f68d053 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.165 1997/07/16 20:32:11 wessels Exp $
+ * $Id: main.cc,v 1.166 1997/07/19 02:56:38 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -593,6 +593,7 @@ main(int argc, char **argv)
        sendSignal();
        /* NOTREACHED */
     }
+
     setMaxFD();
 
     if (opt_catch_signals)
@@ -608,8 +609,6 @@ main(int argc, char **argv)
     fd_open(1, FD_LOG, "stdout");
     fd_open(2, FD_LOG, "stderr");
 
-    hash_init(0);
-
     mainInitialize();
 
     /* main loop */
@@ -674,6 +673,7 @@ sendSignal(void)
     debug_log = stderr;
     if (ConfigFile == NULL)
        ConfigFile = xstrdup(DefaultConfigFile);
+    cbdataInit();
     parseConfigFile(ConfigFile);
     pid = readPidFile();
     if (pid > 1) {

diff --git a/src/protos.h b/src/protos.h
index cc096492e2419042f5142131f7315b8841c3a0a7..e37ca338fec9b4ac433c1e47de07ff2a2ff80ff8 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -210,7 +210,6 @@ extern int gopherCachable _PARAMS((const char *));
 
 
 /* init */
-extern void hash_init _PARAMS((int));
 extern hash_table *hash_create _PARAMS((HASHCMP *, int, HASHHASH *));
 extern int hash_insert _PARAMS((hash_table *, const char *, void *));
 extern int hash_delete _PARAMS((hash_table *, const char *));