From: wessels <>
Date: Tue, 15 Jul 1997 08:30:16 +0000 (+0000)
Subject: typing
X-Git-Tag: SQUID_3_0_PRE1~4890
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89de058c3570320c5ada51cb3fbcb9d5b67ae6e9;p=thirdparty%2Fsquid.git

typing
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 9cb2c9c6cd..51c195b02b 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1449,15 +1449,16 @@ DOC_END
 
 
 NAME: tcp_recv_bufsize
-TYPE: int
-DEFAULT: 0
+COMMENT: (bytes)
+TYPE: size_t
+DEFAULT: 0 bytes
 LOC: Config.tcpRcvBufsz
 DOC_START
 	Size of receive buffer to set for TCP sockets.  Probably just
 	as easy to change your kernel's default.  Set to zero to use
 	the default buffer size.
 
-tcp_recv_bufsize 0
+tcp_recv_bufsize 0 bytes
 DOC_END
 
 
@@ -1573,15 +1574,16 @@ DOC_END
 
 
 NAME: udp_hit_obj_size
-TYPE: int
+COMMENT: (bytes)
+TYPE: size_t
 LOC: Config.udpMaxHitObjsz
-DEFAULT: 0
+DEFAULT: 0 bytes
 DOC_START
 	If set, Squid will limit UDP_HIT_OBJ size to be less than
 	this value.  Setting this value to more than SQUID_UDP_SO_SNDBUF
 	will not work as expected.  Set to zero to select the size
 	permited by the socket.
-udp_hit_obj_size     0
+udp_hit_obj_size     0 bytes
 DOC_END
 
 
@@ -1704,15 +1706,16 @@ DOC_END
 #swap_level2_dirs 256
 
 NAME: store_avg_object_size
-TYPE: int
-DEFAULT: 20
+COMMENT: (bytes)
+TYPE: size_t
+DEFAULT: 20 KB
 LOC: Config.Store.avgObjectSize
 DOC_START
 	Average object size, used to estimate number of objects your
 	cache can hold.  See doc/Release-Notes-1.1.txt.  The default is
 	20K.
 
-store_avg_object_size 20
+store_avg_object_size 20 KB
 DOC_END
 
 NAME: store_objects_per_bucket
diff --git a/src/comm.cc b/src/comm.cc
index 29c059747d..6dd2630a71 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.176 1997/07/14 19:27:28 wessels Exp $
+ * $Id: comm.cc,v 1.177 1997/07/15 02:30:17 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -1070,9 +1070,9 @@ comm_select(time_t sec)
 void
 commSetSelect(int fd, unsigned int type, PF * handler, void *client_data, time_t timeout)
 {
-    fde *F;
+    fde *F = &fd_table[fd];
     assert(fd >= 0);
-    F = &fd_table[fd];
+    assert(F->open == FD_OPEN);
     debug(5, 5) ("commSetSelect: FD %d, type=%d, handler=%p, data=%p\n", fd, type, handler, client_data);
     if (type & COMM_SELECT_READ) {
 	F->read_handler = handler;
diff --git a/src/structs.h b/src/structs.h
index 4fdbd0e112..16f2444afa 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -199,7 +199,7 @@ struct _SquidConfig {
     cache_peer *sslProxy;
     cache_peer *passProxy;
     struct {
-	size_t size;
+	int size;
 	int low;
 	int high;
     } ipcache;