remove UNUSED and OLD code

diff --git a/src/client_side.cc b/src/client_side.cc
index 61b263c31870afa03a36d0dcce498ce451ee8baf..e347ecbc166cdf94ac613594ef6ba93bb58784c2 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.191 1998/01/06 05:12:07 wessels Exp $
+ * $Id: client_side.cc,v 1.192 1998/01/06 05:15:39 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -42,9 +42,6 @@ static const char *const proxy_auth_line =
 
 static CWCB clientHandleIMSComplete;
 static CWCB clientWriteComplete;
-#if UNUSED_CODE
-static CWCB clientShortWriteComplete;
-#endif
 static PF clientReadRequest;
 static PF connStateFree;
 static PF requestTimeout;
@@ -62,9 +59,6 @@ static RH clientRedirectDone;
 static STCB clientHandleIMSReply;
 static int clientGetsOldEntry(StoreEntry * new, StoreEntry * old, request_t * request);
 static int checkAccelOnly(clientHttpRequest *);
-#if UNUSED_CODE
-static ERCB clientErrorComplete;
-#endif
 static STCB clientSendMoreData;
 static STCB clientCacheHit;
 static void clientParseRequestHeaders(clientHttpRequest *);
@@ -740,17 +734,6 @@ clientHierarchical(clientHttpRequest * http)
     return 1;
 }
 
-#if UNUSED_CODE
-static void
-clientErrorComplete(int fd, void *data, size_t size)
-{
-    clientHttpRequest *http = data;
-    if (http)
-       http->out.size += size;
-    comm_close(fd);
-}
-#endif
-
 int
 isTcpHit(log_type code)
 {
@@ -1138,17 +1121,6 @@ clientHandleIMSComplete(int fd, char *bufnotused, size_t size, int flag, void *d
        comm_close(fd);
 }
 
-#if UNUSED_CODE
-static void
-clientShortWriteComplete(int fd, char *bufnotused, size_t size, int flag, void *data)
-{
-    clientHttpRequest *http = data;
-    http->out.size += size;
-    if (flag != COMM_ERR_CLOSING)
-       comm_close(fd);
-}
-#endif
-
 static log_type
 clientProcessRequest2(clientHttpRequest * http)
 {

diff --git a/src/defines.h b/src/defines.h
index 7ad048c6419deddd517a8588ca4612cde86d4d60..b6eb5082375ce7c94d36dacf5145af1807fe834c 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -59,8 +59,7 @@
 
 #define FD_DESC_SZ             64
 
-#define FQDN_FLAG_UNUSED_01    0x01
-#define FQDN_LOOKUP_IF_MISS    0x02
+#define FQDN_LOOKUP_IF_MISS    0x01
 #define FQDN_MAX_NAMES 5
 #define FQDNCACHE_AV_FACTOR 1000
 
@@ -99,8 +98,7 @@
 #define IDENT_PENDING 1
 #define IDENT_DONE 2
 
-#define IP_UNUSED_FLAG_01      0x01
-#define IP_LOOKUP_IF_MISS      0x02
+#define IP_LOOKUP_IF_MISS      0x01
 
 #define IPCACHE_AV_FACTOR 1000
 
@@ -138,12 +136,6 @@
 #define SM_PAGE_SIZE 4096
 #define DISK_PAGE_SIZE  8192
 
-#if UNUSED_CODE
-#define BIT_SET(flag, bit)     ((flag) |= (bit))
-#define BIT_CLR(flag, bit)     ((flag) &= ~(bit))
-#define BIT_TEST(flag, bit)    ((flag) & (bit))
-#endif
-
 #define EBIT_SET(flag, bit)    ((flag) |= ((1<<bit)))
 #define EBIT_CLR(flag, bit)    ((flag) &= ~((1<<bit)))
 #define EBIT_TEST(flag, bit)   ((flag) & ((1<<bit)))

diff --git a/src/dns.cc b/src/dns.cc
index 5fe294e1f26cccabae11a7a038436c1b8a66b1cf..5b28c8731b33b2c49dbbb5c5bc05705882c6583e 100644 (file)
--- a/src/dns.cc
+++ b/src/dns.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns.cc,v 1.48 1998/01/02 22:03:41 wessels Exp $
+ * $Id: dns.cc,v 1.49 1998/01/06 05:15:40 wessels Exp $
  *
  * DEBUG: section 34    Dnsserver interface
  * AUTHOR: Harvest Derived
@@ -346,18 +346,7 @@ dnsShutdownServers(void)
 {
     dnsserver_t *dns = NULL;
     int k;
-
     debug(34, 3) ("dnsShutdownServers:\n");
-
-#if OLD_CODE
-    /*
-     * We used to do this when we waited for all active connections
-     * to close before reconfiguring.
-     */
-    k = ipcacheQueueDrain();
-    if (fqdncacheQueueDrain() || k)
-       return;
-#endif
     for (k = 0; k < NDnsServersAlloc; k++) {
        dns = *(dns_child_table + k);
        if (!EBIT_TEST(dns->flags, HELPER_ALIVE)) {

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 8c586e9344d8f6bedee3c912894aa6575fd10311..c2b250daebaf7c0fc080590d5f912f46d4c7e0c1 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fqdncache.cc,v 1.76 1998/01/02 22:03:41 wessels Exp $
+ * $Id: fqdncache.cc,v 1.77 1998/01/06 05:15:40 wessels Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -793,20 +793,6 @@ fqdnFromAddr(struct in_addr addr)
     return buf;
 }
 
-#if OLD_CODE
-int
-fqdncacheQueueDrain(void)
-{
-    fqdncache_entry *i;
-    dnsserver_t *dnsData;
-    if (!fqdncacheQueueHead)
-       return 0;
-    while ((dnsData = dnsGetFirstAvailable()) && (i = fqdncacheDequeue()))
-       fqdncache_dnsDispatch(dnsData, i);
-    return 1;
-}
-#endif
-
 static void
 fqdncacheLockEntry(fqdncache_entry * f)
 {

diff --git a/src/ipcache.cc b/src/ipcache.cc
index d09b655161ad140069c1c86cdc0bae94567a414b..ca8b24ef923d2e6a53178a172d924e80af8e2cf6 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.152 1998/01/02 22:03:40 wessels Exp $
+ * $Id: ipcache.cc,v 1.153 1998/01/06 05:15:41 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -873,17 +873,6 @@ ipcacheCheckNumeric(const char *name)
     return &static_addrs;
 }
 
-#if OLD_CODE
-int
-ipcacheQueueDrain(void)
-{
-    if (!ipcacheQueueHead)
-       return 0;
-    ipcacheNudgeQueue();
-    return 1;
-}
-#endif
-
 static void
 ipcacheLockEntry(ipcache_entry * i)
 {