Index: HttpHeader.c
===================================================================
RCS file: /server/cvs-server/squid/squid/src/HttpHeader.c,v
retrieving revision 1.70
diff -u -r1.70 HttpHeader.c
--- HttpHeader.c	2001/04/14 00:25:17	1.70
+++ HttpHeader.c	2001/10/17 05:36:09
@@ -683,12 +683,12 @@
 }
 
 void
-httpHeaderPutTime(HttpHeader * hdr, http_hdr_type id, time_t time)
+httpHeaderPutTime(HttpHeader * hdr, http_hdr_type id, time_t htime)
 {
     assert_eid(id);
     assert(Headers[id].type == ftDate_1123);	/* must be of an appropriate type */
     assert(time >= 0);
-    httpHeaderAddEntry(hdr, httpHeaderEntryCreate(id, NULL, mkrfc1123(time)));
+    httpHeaderAddEntry(hdr, httpHeaderEntryCreate(id, NULL, mkrfc1123(htime)));
 }
 
 void
@@ -701,10 +701,10 @@
 }
 
 void
-httpHeaderPutAuth(HttpHeader * hdr, const char *authScheme, const char *realm)
+httpHeaderPutAuth(HttpHeader * hdr, const char *auth_scheme, const char *realm)
 {
-    assert(hdr && authScheme && realm);
-    httpHeaderPutStrf(hdr, HDR_WWW_AUTHENTICATE, "%s realm=\"%s\"", authScheme, realm);
+    assert(hdr && auth_scheme && realm);
+    httpHeaderPutStrf(hdr, HDR_WWW_AUTHENTICATE, "%s realm=\"%s\"", auth_scheme, realm);
 }
 
 void
@@ -877,16 +877,16 @@
 }
 
 const char *
-httpHeaderGetAuth(const HttpHeader * hdr, http_hdr_type id, const char *authScheme)
+httpHeaderGetAuth(const HttpHeader * hdr, http_hdr_type id, const char *auth_scheme)
 {
     const char *field;
     int l;
-    assert(hdr && authScheme);
+    assert(hdr && auth_scheme);
     field = httpHeaderGetStr(hdr, id);
     if (!field)			/* no authorization field */
 	return NULL;
-    l = strlen(authScheme);
-    if (!l || strncasecmp(field, authScheme, l))	/* wrong scheme */
+    l = strlen(auth_scheme);
+    if (!l || strncasecmp(field, auth_scheme, l))	/* wrong scheme */
 	return NULL;
     field += l;
     if (!xisspace(*field))	/* wrong scheme */
Index: access_log.c
===================================================================
RCS file: /server/cvs-server/squid/squid/src/access_log.c,v
retrieving revision 1.69
diff -u -r1.69 access_log.c
--- access_log.c	2001/08/22 23:26:05	1.69
+++ access_log.c	2001/10/17 05:36:09
@@ -127,7 +127,7 @@
 	*buf = '\0';
 	return buf;
     }
-    buf = xcalloc((strlen(header) * 3) + 1, 1);
+    buf = xcalloc(1, (strlen(header) * 3) + 1);
     buf_cursor = buf;
     /*
      * We escape: \x00-\x1F"#%;<>?{}|\\\\^~`\[\]\x7F-\xFF 
@@ -195,7 +195,7 @@
 	*buf = '\0';
 	return buf;
     }
-    buf = xcalloc((strlen(header) * 3) + 1, 1);
+    buf = xcalloc(1, (strlen(header) * 3) + 1);
     buf_cursor = buf;
     /*
      * We escape: space \x00-\x1F and space (0x40) and \x7F-\xFF
Index: acl.c
===================================================================
RCS file: /server/cvs-server/squid/squid/src/acl.c,v
retrieving revision 1.261
diff -u -r1.261 acl.c
--- acl.c	2001/10/11 13:12:57	1.261
+++ acl.c	2001/10/17 05:36:09
@@ -57,7 +57,6 @@
 static void aclLookupProxyAuthDone(void *data, char *result);
 static struct _acl *aclFindByName(const char *name);
 static int aclMatchAcl(struct _acl *, aclCheck_t *);
-static int aclMatchIntegerRange(intrange * data, int i);
 static int aclMatchTime(acl_time_data * data, time_t when);
 static int aclMatchUser(void *proxyauth_acl, char *user);
 static int aclMatchIp(void *dataptr, struct in_addr c);
Index: asn.c
===================================================================
RCS file: /server/cvs-server/squid/squid/src/asn.c,v
retrieving revision 1.71
diff -u -r1.71 asn.c
--- asn.c	2001/03/03 10:39:30	1.71
+++ asn.c	2001/10/17 05:36:10
@@ -408,7 +408,7 @@
 }
 
 static int
-mask_len(int mask)
+mask_len(u_long mask)
 {
     int len = 32;
     if (mask == 0)
Index: enums.h
===================================================================
RCS file: /server/cvs-server/squid/squid/src/enums.h,v
retrieving revision 1.196
diff -u -r1.196 enums.h
--- enums.h	2001/10/08 16:18:32	1.196
+++ enums.h	2001/10/17 05:36:10
@@ -141,7 +141,7 @@
     ACL_LOOKUP_NEEDED,
     ACL_LOOKUP_PENDING,
     ACL_LOOKUP_DONE,
-    ACL_PROXY_AUTH_NEEDED,
+    ACL_PROXY_AUTH_NEEDED
 } acl_lookup_state;
 
 enum {
@@ -513,7 +513,7 @@
     AUTH_ACL_CHALLENGE = -2,
     AUTH_ACL_HELPER = -1,
     AUTH_ACL_CANNOT_AUTHENTICATE = 0,
-    AUTH_AUTHENTICATED = 1,
+    AUTH_AUTHENTICATED = 1
 } auth_acl_t;
 
 typedef enum {
Index: protos.h
===================================================================
RCS file: /server/cvs-server/squid/squid/src/protos.h,v
retrieving revision 1.414
diff -u -r1.414 protos.h
--- protos.h	2001/10/10 15:17:41	1.414
+++ protos.h	2001/10/17 05:36:11
@@ -430,9 +430,9 @@
 /* field manipulation */
 extern int httpHeaderHas(const HttpHeader * hdr, http_hdr_type type);
 extern void httpHeaderPutInt(HttpHeader * hdr, http_hdr_type type, int number);
-extern void httpHeaderPutTime(HttpHeader * hdr, http_hdr_type type, time_t time);
+extern void httpHeaderPutTime(HttpHeader * hdr, http_hdr_type type, time_t htime);
 extern void httpHeaderPutStr(HttpHeader * hdr, http_hdr_type type, const char *str);
-extern void httpHeaderPutAuth(HttpHeader * hdr, const char *authScheme, const char *realm);
+extern void httpHeaderPutAuth(HttpHeader * hdr, const char *auth_scheme, const char *realm);
 extern void httpHeaderPutCc(HttpHeader * hdr, const HttpHdrCc * cc);
 extern void httpHeaderPutContRange(HttpHeader * hdr, const HttpHdrContRange * cr);
 extern void httpHeaderPutRange(HttpHeader * hdr, const HttpHdrRange * range);
@@ -446,7 +446,7 @@
 extern HttpHdrContRange *httpHeaderGetContRange(const HttpHeader * hdr);
 extern const char *httpHeaderGetStr(const HttpHeader * hdr, http_hdr_type id);
 extern const char *httpHeaderGetLastStr(const HttpHeader * hdr, http_hdr_type id);
-extern const char *httpHeaderGetAuth(const HttpHeader * hdr, http_hdr_type id, const char *authScheme);
+extern const char *httpHeaderGetAuth(const HttpHeader * hdr, http_hdr_type id, const char *auth_scheme);
 extern String httpHeaderGetList(const HttpHeader * hdr, http_hdr_type id);
 extern String httpHeaderGetStrOrList(const HttpHeader * hdr, http_hdr_type id);
 extern String httpHeaderGetByName(const HttpHeader * hdr, const char *name);
@@ -680,16 +680,14 @@
 extern void netdbInit(void);
 extern void netdbHandlePingReply(const struct sockaddr_in *from, int hops, int rtt);
 extern void netdbPingSite(const char *hostname);
-extern void netdbInit(void);
 extern void netdbDump(StoreEntry *);
 extern int netdbHops(struct in_addr);
 extern void netdbFreeMemory(void);
 extern int netdbHostHops(const char *host);
 extern int netdbHostRtt(const char *host);
-extern int netdbHostPeerRtt(const char *host, peer * peer);
+extern int netdbHostPeerRtt(const char *host, peer * p);
 extern void netdbUpdatePeer(request_t *, peer * e, int rtt, int hops);
 extern void netdbDeleteAddrNetwork(struct in_addr addr);
-extern int netdbHostPeerRtt(const char *host, peer * peer);
 extern void netdbBinaryExchange(StoreEntry *);
 extern EVH netdbExchangeStart;
 extern void netdbExchangeUpdatePeer(struct in_addr, peer *, double, double);
@@ -792,7 +790,8 @@
 
 /* ident.c */
 #if USE_IDENT
-extern void identStart(struct sockaddr_in *me, struct sockaddr_in *peer, IDCB * callback, void *cbdata);
+extern void identStart(struct sockaddr_in *me, struct sockaddr_in *my_peer,
+  IDCB * callback, void *cbdata);
 extern void identInit(void);
 #endif
 
@@ -893,16 +892,13 @@
 extern void storeLockObject(StoreEntry *);
 extern void storeRelease(StoreEntry *);
 extern int storeUnlockObject(StoreEntry *);
-extern int storePendingNClients(const StoreEntry *);
 extern EVH storeMaintainSwapSpace;
 extern void storeExpireNow(StoreEntry *);
 extern void storeReleaseRequest(StoreEntry *);
-extern off_t storeLowestMemReaderOffset(const StoreEntry *);
 extern void storeConfigure(void);
 extern void storeNegativeCache(StoreEntry *);
 extern void storeFreeMemory(void);
 extern int expiresMoreThan(time_t, time_t);
-extern void InvokeHandlers(StoreEntry *);
 extern int storeEntryValidToSend(StoreEntry *);
 extern void storeTimestampsSet(StoreEntry *);
 extern void storeRegisterAbort(StoreEntry * e, STABH * cb, void *);
@@ -1028,7 +1024,7 @@
  */
 extern void storeRebuildStart(void);
 extern void storeRebuildComplete(struct _store_rebuild_data *);
-extern void storeRebuildProgress(int index, int total, int sofar);
+extern void storeRebuildProgress(int sd_index, int total, int sofar);
 
 /*
  * store_swapin.c
Index: store_rebuild.c
===================================================================
RCS file: /server/cvs-server/squid/squid/src/store_rebuild.c,v
retrieving revision 1.75
diff -u -r1.75 store_rebuild.c
--- store_rebuild.c	2001/01/12 00:37:22	1.75
+++ store_rebuild.c	2001/10/17 05:36:11
@@ -172,24 +172,24 @@
  * progress.
  */
 void
-storeRebuildProgress(int index, int total, int sofar)
+storeRebuildProgress(int sd_index, int total, int sofar)
 {
     static time_t last_report = 0;
     double n = 0.0;
     double d = 0.0;
-    if (index < 0)
+    if (sd_index < 0)
 	return;
-    if (index >= Config.cacheSwap.n_configured)
+    if (sd_index >= Config.cacheSwap.n_configured)
 	return;
     if (NULL == RebuildProgress)
 	return;
-    RebuildProgress[index].total = total;
-    RebuildProgress[index].scanned = sofar;
+    RebuildProgress[sd_index].total = total;
+    RebuildProgress[sd_index].scanned = sofar;
     if (squid_curtime - last_report < 15)
 	return;
-    for (index = 0; index < Config.cacheSwap.n_configured; index++) {
-	n += (double) RebuildProgress[index].scanned;
-	d += (double) RebuildProgress[index].total;
+    for (sd_index = 0; sd_index < Config.cacheSwap.n_configured; sd_index++) {
+	n += (double) RebuildProgress[sd_index].scanned;
+	d += (double) RebuildProgress[sd_index].total;
     }
     debug(20, 1) ("Store rebuilding is %4.1f%% complete\n", 100.0 * n / d);
     last_report = squid_curtime;