From: wessels <>
Date: Mon, 21 Sep 1998 12:49:39 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: SQUID_3_0_PRE1~2682
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f9aa36563b25114e9a03d886f2c932ec2d47c74;p=thirdparty%2Fsquid.git

*** empty log message ***
---

diff --git a/src/asn.cc b/src/asn.cc
index 65e0fbb990..ff8273eec1 100644
--- a/src/asn.cc
+++ b/src/asn.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: asn.cc,v 1.48 1998/09/10 22:30:19 wessels Exp $
+ * $Id: asn.cc,v 1.49 1998/09/21 06:49:39 wessels Exp $
  *
  * DEBUG: section 53    AS Number handling
  * AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -176,19 +176,17 @@ static void
 asnCacheStart(int as)
 {
     LOCAL_ARRAY(char, asres, 4096);
-    const cache_key *k;
     StoreEntry *e;
     request_t *req;
     ASState *asState = xcalloc(1, sizeof(ASState));
     cbdataAdd(asState, MEM_NONE);
     debug(53, 3) ("asnCacheStart: AS %d\n", as);
     snprintf(asres, 4096, "whois://%s/!gAS%d", Config.as_whois_server, as);
-    k = storeKeyPublic(asres, METHOD_GET);
     asState->as_number = as;
     req = urlParse(METHOD_GET, asres);
     assert(NULL != req);
     asState->request = requestLink(req);
-    if ((e = storeGet(k)) == NULL) {
+    if ((e = storeGetPublic(asres, METHOD_GET)) == NULL) {
 	e = storeCreateEntry(asres, asres, null_request_flags, METHOD_GET);
 	storeClientListAdd(e, asState);
 	fwdStart(-1, e, asState->request, no_addr);
diff --git a/src/client_side.cc b/src/client_side.cc
index b7437070c9..2a546d2f5f 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.398 1998/09/19 17:05:59 wessels Exp $
+ * $Id: client_side.cc,v 1.399 1998/09/21 06:49:41 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -449,7 +449,6 @@ clientPurgeRequest(clientHttpRequest * http)
 {
     StoreEntry *entry;
     ErrorState *err = NULL;
-    const cache_key *k;
     HttpReply *r;
     debug(33, 3) ("Config.onoff.enable_purge = %d\n", Config.onoff.enable_purge);
     if (!Config.onoff.enable_purge) {
@@ -462,8 +461,7 @@ clientPurgeRequest(clientHttpRequest * http)
 	return;
     }
     http->log_type = LOG_TCP_MISS;
-    k = storeKeyPublic(http->uri, METHOD_GET);
-    if ((entry = storeGet(k)) == NULL) {
+    if ((entry = storeGetPublic(http->uri, METHOD_GET)) == NULL) {
 	http->http_code = HTTP_NOT_FOUND;
     } else {
 	storeRelease(entry);
@@ -1584,11 +1582,11 @@ clientProcessRequest2(clientHttpRequest * http)
     const cache_key *key;
     StoreEntry *e;
     key = storeKeyPublic(http->uri, r->method);
-    e = http->entry = storeGet(key);
+    e = http->entry = storeGetPublic(http->uri, r->method);
     if (r->method == METHOD_HEAD && e == NULL) {
 	/* We can generate a HEAD reply from a cached GET object */
 	key = storeKeyPublic(http->uri, METHOD_GET);
-	e = http->entry = storeGet(key);
+	e = http->entry = storeGetPublic(http->uri, METHOD_GET);
     }
 #if USE_CACHE_DIGESTS
     http->lookup_type = e ? "HIT" : "MISS";