Removed some old "pump" leftovers

diff --git a/src/enums.h b/src/enums.h
index bfcc6591a4f903954ded8cff9badee73212328da..4d66ff6df34b17f25201b97d2ca9ac9366ebe585 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.185 2001/02/09 19:35:11 hno Exp $
+ * $Id: enums.h,v 1.186 2001/02/17 07:28:50 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -483,8 +483,10 @@ enum {
     ENTRY_NEGCACHED,
     ENTRY_VALIDATED,
     ENTRY_BAD_LENGTH,
-    ENTRY_ABORTED,
-    ENTRY_DONT_LOG             /* hack for gross 'Pump' entries */
+    ENTRY_ABORTED
+#if UNUSED_CODE
+    ENTRY_DONT_LOG
+#endif
 };
 
 typedef enum {
@@ -644,7 +646,6 @@ typedef enum {
     MEM_TLV,
     MEM_SWAP_LOG_DATA,
     MEM_GEN_CBDATA,
-    MEM_PUMP_STATE_DATA,
     MEM_CLIENT_REQ_BUF,
     MEM_MAX
 #ifdef NTLM_CACHING

diff --git a/src/mem.cc b/src/mem.cc
index dbe590f68d1ed85012ad00b22113d50444a6a5a9..771209c0dbdce4872fcb655b3c5794dfb6f112ac 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: mem.cc,v 1.54 2001/01/12 00:37:19 wessels Exp $
+ * $Id: mem.cc,v 1.55 2001/02/17 07:28:50 hno Exp $
  *
  * DEBUG: section 13    High Level Memory Pool Management
  * AUTHOR: Harvest Derived
@@ -302,7 +302,6 @@ memInit(void)
     memDataInit(MEM_STORE_IO, "storeIOState", sizeof(storeIOState), 0);
     memDataInit(MEM_TLV, "storeSwapTLV", sizeof(tlv), 0);
     memDataInit(MEM_GEN_CBDATA, "generic_cbdata", sizeof(generic_cbdata), 0);
-    memDataInit(MEM_PUMP_STATE_DATA, "PumpStateData", sizeof(PumpStateData), 0);
     memDataInit(MEM_CLIENT_REQ_BUF, "clientRequestBuffer", CLIENT_REQ_BUF_SZ, 0);
     memDataInit(MEM_SWAP_LOG_DATA, "storeSwapLogData", sizeof(storeSwapLogData), 0);
 

diff --git a/src/store_log.cc b/src/store_log.cc
index 78f7d51fa070e3e0be42c482a8ae1e5204746368..c0ca87ac1bf422d045edf6b3affdf52eeba1cb58 100644 (file)
--- a/src/store_log.cc
+++ b/src/store_log.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_log.cc,v 1.21 2001/01/12 00:37:22 wessels Exp $
+ * $Id: store_log.cc,v 1.22 2001/02/17 07:28:50 hno Exp $
  *
  * DEBUG: section 20    Storage Manager Logging Functions
  * AUTHOR: Duane Wessels
@@ -53,8 +53,10 @@ storeLog(int tag, const StoreEntry * e)
     HttpReply *reply;
     if (NULL == storelog)
        return;
+#if UNUSED_CODE
     if (EBIT_TEST(e->flags, ENTRY_DONT_LOG))
        return;
+#endif
     if (mem != NULL) {
        if (mem->log_url == NULL) {
            debug(20, 1) ("storeLog: NULL log_url for %s\n", mem->url);

diff --git a/src/structs.h b/src/structs.h
index 55fb2f1b9e1bfcfad6dc2e01cda379a4c81e2716..5f1cb110041397cef9f5ba5fcf22be0d89d10f04 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.382 2001/02/10 16:40:41 hno Exp $
+ * $Id: structs.h,v 1.383 2001/02/17 07:28:50 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -2034,24 +2034,6 @@ struct _store_rebuild_data {
     int zero_object_sz;
 };
 
-struct _PumpStateData {
-    FwdState *fwd;
-    request_t *req;
-    store_client *sc;          /* The store client we're using */
-    int c_fd;                  /* client fd */
-    int s_fd;                  /* server end */
-    int rcvd;                  /* bytes received from client */
-    int sent;                  /* bytes sent to server */
-    StoreEntry *request_entry; /* the request entry */
-    StoreEntry *reply_entry;   /* the reply entry */
-    CWCB *callback;            /* what to do when we finish sending */
-    void *cbdata;              /* callback data passed to callback func */
-    struct {
-       int closing:1;
-    } flags;
-    struct _PumpStateData *next;
-};
-
 /*
  * This defines an fs type
  */

diff --git a/src/typedefs.h b/src/typedefs.h
index 33432bf1be8b0ad1af15f4b248a134d859812ee2..43a159cba313c6fdeffabf00b9b0a3c1656cb873 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.122 2001/02/07 18:56:52 hno Exp $
+ * $Id: typedefs.h,v 1.123 2001/02/17 07:28:50 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -178,7 +178,6 @@ typedef struct _storeIOState storeIOState;
 typedef struct _queued_read queued_read;
 typedef struct _queued_write queued_write;
 typedef struct _link_list link_list;
-typedef struct _PumpStateData PumpStateData;
 typedef struct _storefs_entry storefs_entry_t;
 typedef struct _storerepl_entry storerepl_entry_t;
 typedef struct _diskd_queue diskd_queue;