---------------------
PatchSet 1093 
Date: 2001/01/05 12:27:48
Author: adri
Branch: modio
Tag: (none) 
Log:
Merge another storeKeyPublic() / storeGet() sequence with storeGetPublic().

Members: 
	src/peer_digest.c:1.2.2.2->1.2.2.3 

Index: squid/src/peer_digest.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/peer_digest.c,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- squid/src/peer_digest.c	20 Dec 2000 12:41:22 -0000	1.2.2.2
+++ squid/src/peer_digest.c	5 Jan 2001 12:27:48 -0000	1.2.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_digest.c,v 1.2.2.2 2000/12/20 12:41:22 adri Exp $
+ * $Id: peer_digest.c,v 1.2.2.3 2001/01/05 12:27:48 adri Exp $
  *
  * DEBUG: section 72    Peer Digest Routines
  * AUTHOR: Alex Rousskov
@@ -267,7 +267,6 @@
     peer *p = pd->peer;
     StoreEntry *e, *old_e;
     char *url;
-    const cache_key *key;
     request_t *req;
     DigestFetchState *fetch = NULL;
 
@@ -281,8 +280,7 @@
 	url = internalRemoteUri(p->host, p->http_port,
 	    "/squid-internal-periodic/", StoreDigestFileName);
 
-    key = storeKeyPublic(url, METHOD_GET);
-    debug(72, 2) ("peerDigestRequest: %s key: %s\n", url, storeKeyText(key));
+    debug(72, 2) ("peerDigestRequest: %s\n", url);
     req = urlParse(METHOD_GET, url);
     assert(req);
 
@@ -307,7 +305,7 @@
     req->flags.cachable = 1;
     /* the rest is based on clientProcessExpired() */
     req->flags.refresh = 1;
-    old_e = fetch->old_entry = storeGet(key);
+    old_e = fetch->old_entry = storeGetPublic(url, METHOD_GET);
     if (old_e) {
 	debug(72, 5) ("peerDigestRequest: found old entry\n");
 	storeLockObject(old_e);