Killed lots of old now unused MEM_* types.

diff --git a/src/enums.h b/src/enums.h
index 8cdc50a44dd9bd5e22b17d667b59918a8911a5df..14fdf350b435cba4ca8fbbde2d129ef2794c94a8 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.192 2001/04/20 12:40:25 hno Exp $
+ * $Id: enums.h,v 1.193 2001/04/20 21:34:39 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -554,10 +554,7 @@ typedef enum {
     MEM_16K_BUF,
     MEM_32K_BUF,
     MEM_64K_BUF,
-    MEM_ACCESSLOGENTRY,
     MEM_ACL,
-    MEM_ACLCHECK_T,
-    MEM_ACL_ACCESS,
     MEM_ACL_DENY_INFO_LIST,
     MEM_ACL_IP_DATA,
     MEM_ACL_LIST,
@@ -567,39 +564,20 @@ typedef enum {
     MEM_ACL_PROXY_AUTH_MATCH,
     MEM_ACL_USER_DATA,
     MEM_ACL_TIME_DATA,
-    MEM_CACHEMGR_PASSWD,
 #if USE_CACHE_DIGESTS
     MEM_CACHE_DIGEST,
 #endif
-    MEM_CLIENTHTTPREQUEST,
     MEM_CLIENT_INFO,
     MEM_CLIENT_SOCK_BUF,
-    MEM_CLOSE_HANDLER,
-    MEM_COMMWRITESTATEDATA,
-    MEM_CONNSTATEDATA,
     MEM_LINK_LIST,
-    MEM_DLINK_LIST,
     MEM_DLINK_NODE,
-    MEM_DNSSERVER_T,
-    MEM_DOMAIN_PING,
-    MEM_DOMAIN_TYPE,
     MEM_DONTFREE,
     MEM_DREAD_CTRL,
     MEM_DWRITE_Q,
-    MEM_ERRORSTATE,
-    MEM_FILEMAP,
     MEM_FQDNCACHE_ENTRY,
     MEM_FWD_SERVER,
-    MEM_FWD_STATE,
-    MEM_HASH_LINK,
-    MEM_HASH_TABLE,
-    MEM_HELPER,
-    MEM_HELPER_STATEFUL,
-    MEM_HELPER_SERVER,
-    MEM_HELPER_STATEFUL_SERVER,
     MEM_HELPER_REQUEST,
     MEM_HELPER_STATEFUL_REQUEST,
-    MEM_HIERARCHYLOGENTRY,
 #if USE_HTCP
     MEM_HTCP_SPECIFIER,
     MEM_HTCP_DETAIL,
@@ -610,53 +588,26 @@ typedef enum {
     MEM_HTTP_HDR_RANGE,
     MEM_HTTP_HDR_RANGE_SPEC,
     MEM_HTTP_REPLY,
-    MEM_HTTP_STATE_DATA,
-    MEM_ICPUDPDATA,
-    MEM_ICP_COMMON_T,
-    MEM_ICP_PING_DATA,
     MEM_INTLIST,
-    MEM_IOSTATS,
     MEM_IPCACHE_ENTRY,
     MEM_MD5_DIGEST,
     MEM_MEMOBJECT,
     MEM_MEM_NODE,
     MEM_NETDBENTRY,
     MEM_NET_DB_NAME,
-    MEM_NET_DB_PEER,
-    MEM_PEER,
-#if USE_CACHE_DIGESTS
-    MEM_PEER_DIGEST,
-#endif
-#if USE_ICMP
-    MEM_PINGERECHODATA,
-    MEM_PINGERREPLYDATA,
-#endif
-    MEM_PS_STATE,
-    MEM_REFRESH_T,
     MEM_RELIST,
     MEM_REQUEST_T,
-    MEM_SQUIDCONFIG,
-    MEM_SQUIDCONFIG2,
-    MEM_STATCOUNTERS,
     MEM_STMEM_BUF,
     MEM_STOREENTRY,
-    MEM_STORE_CLIENT,
-    MEM_SWAPDIR,
-    MEM_USHORTLIST,
     MEM_WORDLIST,
-    MEM_STORE_IO,
 #if !USE_DNSSERVERS
     MEM_IDNS_QUERY,
 #endif
     MEM_EVENT,
     MEM_TLV,
     MEM_SWAP_LOG_DATA,
-    MEM_GEN_CBDATA,
     MEM_CLIENT_REQ_BUF,
     MEM_MAX
-#ifdef NTLM_CACHING
-    ,MEM_NTLM_AUTH_CACHE
-#endif
 } mem_type;
 
 /*

diff --git a/src/mem.cc b/src/mem.cc
index 84d7bedb7dd0415907352a9161a129454d679980..28e84a3300d1aa3c28c8a2320ebf23d234f2f2c0 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: mem.cc,v 1.57 2001/04/20 12:40:26 hno Exp $
+ * $Id: mem.cc,v 1.58 2001/04/20 21:34:39 hno Exp $
  *
  * DEBUG: section 13    High Level Memory Pool Management
  * AUTHOR: Harvest Derived
@@ -193,11 +193,7 @@ memInit(void)
     memDataInit(MEM_32K_BUF, "32K Buffer", 32768, 10);
     memDataInit(MEM_64K_BUF, "64K Buffer", 65536, 10);
     memDataInit(MEM_CLIENT_SOCK_BUF, "Client Socket Buffer", CLIENT_SOCK_SZ, 0);
-    memDataInit(MEM_ACCESSLOGENTRY, "AccessLogEntry",
-       sizeof(AccessLogEntry), 10);
     memDataInit(MEM_ACL, "acl", sizeof(acl), 0);
-    memDataInit(MEM_ACLCHECK_T, "aclCheck_t", sizeof(aclCheck_t), 0);
-    memDataInit(MEM_ACL_ACCESS, "acl_access", sizeof(acl_access), 0);
     memDataInit(MEM_ACL_DENY_INFO_LIST, "acl_deny_info_list",
        sizeof(acl_deny_info_list), 0);
     memDataInit(MEM_ACL_IP_DATA, "acl_ip_data", sizeof(acl_ip_data), 0);
@@ -212,91 +208,40 @@ memInit(void)
        sizeof(acl_proxy_auth_match_cache), 0);
     memDataInit(MEM_ACL_USER_DATA, "acl_user_data",
        sizeof(acl_user_data), 0);
-    memDataInit(MEM_CACHEMGR_PASSWD, "cachemgr_passwd",
-       sizeof(cachemgr_passwd), 0);
 #if USE_CACHE_DIGESTS
     memDataInit(MEM_CACHE_DIGEST, "CacheDigest", sizeof(CacheDigest), 0);
 #endif
-    memDataInit(MEM_CLIENTHTTPREQUEST, "clientHttpRequest",
-       sizeof(clientHttpRequest), 0);
-    memDataInit(MEM_CLOSE_HANDLER, "close_handler", sizeof(close_handler), 0);
-    memDataInit(MEM_COMMWRITESTATEDATA, "CommWriteStateData",
-       sizeof(CommWriteStateData), 0);
-    memDataInit(MEM_CONNSTATEDATA, "ConnStateData", sizeof(ConnStateData), 0);
     memDataInit(MEM_LINK_LIST, "link_list", sizeof(link_list), 10);
-    memDataInit(MEM_DLINK_LIST, "dlink_list", sizeof(dlink_list), 10);
     memDataInit(MEM_DLINK_NODE, "dlink_node", sizeof(dlink_node), 10);
-    memDataInit(MEM_DNSSERVER_T, "dnsserver_t", sizeof(dnsserver_t), 0);
-    memDataInit(MEM_DOMAIN_PING, "domain_ping", sizeof(domain_ping), 0);
-    memDataInit(MEM_DOMAIN_TYPE, "domain_type", sizeof(domain_type), 0);
     memDataInit(MEM_DREAD_CTRL, "dread_ctrl", sizeof(dread_ctrl), 0);
     memDataInit(MEM_DWRITE_Q, "dwrite_q", sizeof(dwrite_q), 0);
-    memDataInit(MEM_ERRORSTATE, "ErrorState", sizeof(ErrorState), 0);
-    memDataInit(MEM_FILEMAP, "fileMap", sizeof(fileMap), 0);
-    memDataInit(MEM_FWD_STATE, "FwdState", sizeof(FwdState), 0);
     memDataInit(MEM_FWD_SERVER, "FwdServer", sizeof(FwdServer), 0);
-    memDataInit(MEM_HASH_LINK, "hash_link", sizeof(hash_link), 0);
-    memDataInit(MEM_HASH_TABLE, "hash_table", sizeof(hash_table), 0);
-    memDataInit(MEM_HIERARCHYLOGENTRY, "HierarchyLogEntry",
-       sizeof(HierarchyLogEntry), 0);
-    memDataInit(MEM_HTTP_STATE_DATA, "HttpStateData", sizeof(HttpStateData), 0);
     memDataInit(MEM_HTTP_REPLY, "HttpReply", sizeof(HttpReply), 0);
     memDataInit(MEM_HTTP_HDR_ENTRY, "HttpHeaderEntry", sizeof(HttpHeaderEntry), 0);
     memDataInit(MEM_HTTP_HDR_CC, "HttpHdrCc", sizeof(HttpHdrCc), 0);
     memDataInit(MEM_HTTP_HDR_RANGE_SPEC, "HttpHdrRangeSpec", sizeof(HttpHdrRangeSpec), 0);
     memDataInit(MEM_HTTP_HDR_RANGE, "HttpHdrRange", sizeof(HttpHdrRange), 0);
     memDataInit(MEM_HTTP_HDR_CONTENT_RANGE, "HttpHdrContRange", sizeof(HttpHdrContRange), 0);
-    memDataInit(MEM_ICPUDPDATA, "icpUdpData", sizeof(icpUdpData), 0);
-    memDataInit(MEM_ICP_COMMON_T, "icp_common_t", sizeof(icp_common_t), 0);
-    memDataInit(MEM_ICP_PING_DATA, "ping_data", sizeof(ping_data), 0);
     memDataInit(MEM_INTLIST, "intlist", sizeof(intlist), 0);
-    memDataInit(MEM_IOSTATS, "iostats", sizeof(iostats), 0);
     memDataInit(MEM_MEMOBJECT, "MemObject", sizeof(MemObject),
        Squid_MaxFD >> 3);
     memDataInit(MEM_MEM_NODE, "mem_node", sizeof(mem_node), 0);
     memDataInit(MEM_NETDBENTRY, "netdbEntry", sizeof(netdbEntry), 0);
     memDataInit(MEM_NET_DB_NAME, "net_db_name", sizeof(net_db_name), 0);
-    memDataInit(MEM_NET_DB_PEER, "net_db_peer", sizeof(net_db_peer), 0);
-    memDataInit(MEM_PEER, "peer", sizeof(peer), 0);
-#if USE_CACHE_DIGESTS
-    memDataInit(MEM_PEER_DIGEST, "PeerDigest", sizeof(PeerDigest), 0);
-#endif
-#if USE_ICMP
-    memDataInit(MEM_PINGERECHODATA, "pingerEchoData",
-       sizeof(pingerEchoData), 0);
-    memDataInit(MEM_PINGERREPLYDATA, "pingerReplyData",
-       sizeof(pingerReplyData), 0);
-#endif
-    memDataInit(MEM_PS_STATE, "ps_state", sizeof(ps_state), 0);
-    memDataInit(MEM_REFRESH_T, "refresh_t", sizeof(refresh_t), 0);
     memDataInit(MEM_RELIST, "relist", sizeof(relist), 0);
     memDataInit(MEM_REQUEST_T, "request_t", sizeof(request_t),
        Squid_MaxFD >> 3);
-    memDataInit(MEM_SQUIDCONFIG, "SquidConfig", sizeof(SquidConfig), 0);
-    memDataInit(MEM_SQUIDCONFIG2, "SquidConfig2", sizeof(SquidConfig2), 0);
-    memDataInit(MEM_STATCOUNTERS, "StatCounters", sizeof(StatCounters), 0);
     memDataInit(MEM_STMEM_BUF, "Store Mem Buffer", SM_PAGE_SIZE,
        Config.memMaxSize / SM_PAGE_SIZE);
     memDataInit(MEM_STOREENTRY, "StoreEntry", sizeof(StoreEntry), 0);
-    memDataInit(MEM_STORE_CLIENT, "store_client", sizeof(store_client), 0);
-    memDataInit(MEM_SWAPDIR, "SwapDir", sizeof(SwapDir), 0);
-    memDataInit(MEM_USHORTLIST, "ushort_list", sizeof(ushortlist), 0);
     memDataInit(MEM_WORDLIST, "wordlist", sizeof(wordlist), 0);
     memDataInit(MEM_CLIENT_INFO, "ClientInfo", sizeof(ClientInfo), 0);
     memDataInit(MEM_MD5_DIGEST, "MD5 digest", MD5_DIGEST_CHARS, 0);
-    memDataInit(MEM_HELPER, "helper", sizeof(helper), 0);
-    memDataInit(MEM_HELPER_STATEFUL, "stateful_helper", sizeof(statefulhelper), 0);
     memDataInit(MEM_HELPER_REQUEST, "helper_request",
        sizeof(helper_request), 0);
     memDataInit(MEM_HELPER_STATEFUL_REQUEST, "helper_stateful_request",
        sizeof(helper_stateful_request), 0);
-    memDataInit(MEM_HELPER_SERVER, "helper_server",
-       sizeof(helper_server), 0);
-    memDataInit(MEM_HELPER_STATEFUL_SERVER, "helper_stateful_server",
-       sizeof(helper_stateful_server), 0);
-    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_CLIENT_REQ_BUF, "clientRequestBuffer", CLIENT_REQ_BUF_SZ, 0);
     memDataInit(MEM_SWAP_LOG_DATA, "storeSwapLogData", sizeof(storeSwapLogData), 0);