Finish previous MemPool conversion

diff --git a/src/acl.cc b/src/acl.cc
index 0d84b36bea67deecb36ccd4ee3d6a627f5a7b0a0..4a847c506efb38ac287fb6e6ec925ec7d2752a4b 100644 (file)
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl.cc,v 1.316 2005/10/23 11:55:32 hno Exp $
+ * $Id: acl.cc,v 1.317 2006/04/22 13:53:21 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -428,8 +428,7 @@ ACL::cacheMatchAcl(dlink_list * cache, ACLChecklist *checklist)
         link = link->next;
     }
 
-    auth_match = NULL;
-    auth_match = (acl_proxy_auth_match_cache *)memAllocate(MEM_ACL_PROXY_AUTH_MATCH);
+    auth_match = new acl_proxy_auth_match_cache();
     auth_match->matchrv = matchForCache (checklist);
     auth_match->acl_data = this;
     dlinkAddTail(auth_match, &auth_match->link, cache);
@@ -451,7 +450,7 @@ aclCacheMatchFlush(dlink_list * cache)
         tmplink = link;
         link = link->next;
         dlinkDelete(tmplink, cache);
-        memFree(auth_match, MEM_ACL_PROXY_AUTH_MATCH);
+        delete auth_match;
     }
 }
 

diff --git a/src/enums.h b/src/enums.h
index 4aa531bfd19662a99a14628ace353dbcc3fafcef..84d2d4790784c92323860f526be0945b6c2432f8 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.247 2006/04/22 05:29:19 robertc Exp $
+ * $Id: enums.h,v 1.248 2006/04/22 13:53:21 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -455,7 +455,6 @@ typedef enum {
     MEM_64K_BUF,
     MEM_ACL_DENY_INFO_LIST,
     MEM_ACL_NAME_LIST,
-    MEM_ACL_PROXY_AUTH_MATCH,
 #if USE_CACHE_DIGESTS
     MEM_CACHE_DIGEST,
 #endif