Replaced the single-line wrapper function storeEntryReplaceObject

with direct calls to StoreEntry->replaceHttpReply();

diff --git a/src/cache_manager.cc b/src/cache_manager.cc
index 285cb391a07f39955c82a7270779f9abb59c5dff..e1cdddcba081476180c820e237608c317b50b15d 100644 (file)
--- a/src/cache_manager.cc
+++ b/src/cache_manager.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_manager.cc,v 1.36 2006/02/17 18:10:59 wessels Exp $
+ * $Id: cache_manager.cc,v 1.37 2006/02/17 20:15:35 wessels Exp $
  *
  * DEBUG: section 16    Cache Manager Objects
  * AUTHOR: Duane Wessels
@@ -295,7 +295,7 @@ cachemgrStart(int fd, HttpRequest * request, StoreEntry * entry)
         httpHeaderPutAuth(&rep->header, "Basic", mgr->action);
 
         /* store the reply */
-        storeEntryReplaceObject(entry, rep);
+        entry->replaceHttpReply(rep);
 
         entry->expires = squid_curtime;
 
@@ -325,7 +325,7 @@ cachemgrStart(int fd, HttpRequest * request, StoreEntry * entry)
                         -1,                    /* C-Len */
                         squid_curtime, /* LMT */
                         squid_curtime);
-        storeEntryReplaceObject(entry, rep);
+        entry->replaceHttpReply(rep);
     }
 
     a->handler(entry);

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 3873d54459e5b6180861dcdf380f607c8cd05f79..fc594f7ae231fda2f0808c4bcda08c1fc32c18a2 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.cc,v 1.95 2006/02/17 18:10:59 wessels Exp $
+ * $Id: client_side_reply.cc,v 1.96 2006/02/17 20:15:35 wessels Exp $
  *
  * DEBUG: section 88    Client-side Reply Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -739,7 +739,7 @@ clientReplyContext::cacheHit(StoreIOBuffer result)
              * reply has a meaningful Age: header.
              */
             e->timestamp = timestamp;
-            storeEntryReplaceObject(e, temprep);
+            e->replaceHttpReply(temprep);
             e->complete();
             /* TODO: why put this in the store and then serialise it and then parse it again.
              * Simply mark the request complete in our context and
@@ -826,7 +826,7 @@ clientReplyContext::processMiss()
 
             storeReleaseRequest(http->storeEntry());
             rep->redirect(http->redirect.status, http->redirect.location);
-            storeEntryReplaceObject(http->storeEntry(), rep);
+            http->storeEntry()->replaceHttpReply(rep);
             http->storeEntry()->complete();
             return;
         }
@@ -1033,7 +1033,7 @@ clientReplyContext::purgeDoPurgeHead(StoreEntry *newEntry)
 
     r->setHeaders(version, purgeStatus, NULL, NULL, 0, 0, -1);
 
-    storeEntryReplaceObject(http->storeEntry(), r);
+    http->storeEntry()->replaceHttpReply(r);
 
     http->storeEntry()->complete();
 }
@@ -1057,7 +1057,7 @@ clientReplyContext::traceReply(clientStreamNode * node)
     HttpVersion version(1,0);
     rep->setHeaders(version, HTTP_OK, NULL, "text/plain",
                     http->request->prefixLen(), 0, squid_curtime);
-    storeEntryReplaceObject(http->storeEntry(), rep);
+    http->storeEntry()->replaceHttpReply(rep);
     http->request->swapOut(http->storeEntry());
     http->storeEntry()->complete();
 }

diff --git a/src/errorpage.cc b/src/errorpage.cc
index a9e96e825ebeb65e98c95b7ec5ecb44e46c97362..60ffc6fb7a47fd0287082cba84dc8fc8f0e7ea54 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: errorpage.cc,v 1.207 2006/02/17 18:10:59 wessels Exp $
+ * $Id: errorpage.cc,v 1.208 2006/02/17 20:15:35 wessels Exp $
  *
  * DEBUG: section 4     Error Generation
  * AUTHOR: Duane Wessels
@@ -376,7 +376,7 @@ errorAppendEntry(StoreEntry * entry, ErrorState * err)
      * on 407/401 responses, and do not check the accel state on 401/407 responses 
      */
     authenticateFixHeader(rep, err->auth_user_request, err->request, 0, 1);
-    storeEntryReplaceObject(entry, rep);
+    entry->replaceHttpReply(rep);
     EBIT_CLR(entry->flags, ENTRY_FWD_HDR_WAIT);
     storeBufferFlush(entry);
     entry->complete();

diff --git a/src/ftp.cc b/src/ftp.cc
index 6c6a7741e4702fbefc51ee0a8313949782c565ac..43a1c36ebdad5b54069516d84fe3d6604f856722 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.384 2006/02/17 18:10:59 wessels Exp $
+ * $Id: ftp.cc,v 1.385 2006/02/17 20:15:35 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -1469,7 +1469,7 @@ FtpStateData::start()
         /* create appropriate reply */
         HttpReply *reply = ftpAuthRequired(request, realm);
 
-        storeEntryReplaceObject(entry, reply);
+        entry->replaceHttpReply(reply);
 
         fwd->complete();
 
@@ -3167,7 +3167,7 @@ FtpStateData::appendSuccessHeader()
 
 #endif
 
-    storeEntryReplaceObject(e, reply);
+    e->replaceHttpReply(reply);
 
     storeTimestampsSet(e);
 
@@ -3350,7 +3350,7 @@ FtpStateData::takeAdaptedHeaders(HttpReply *rep)
     }
 
     assert (rep);
-    storeEntryReplaceObject(entry, rep);
+    entry->replaceHttpReply(rep);
     HTTPMSGUNLOCK(reply);
 
     reply = HTTPMSGLOCK(rep);

diff --git a/src/http.cc b/src/http.cc
index 1eac276475bb55dccb9f3fd7df5ea301a3bf79f3..55509eeb2e939ec82c8de557b01e53dd50c1bf16 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.486 2006/02/17 18:10:59 wessels Exp $
+ * $Id: http.cc,v 1.487 2006/02/17 20:15:35 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -696,7 +696,7 @@ HttpStateData::failReply(HttpReply *reply, http_status const & status)
 {
     reply->sline.version = HttpVersion(1, 0);
     reply->sline.status = status;
-    storeEntryReplaceObject (entry, reply);
+    entry->replaceHttpReply(reply);
 
     if (eof == 1) {
         transactionComplete();
@@ -806,7 +806,7 @@ HttpStateData::processReplyHeader()
 
 #endif
 
-    storeEntryReplaceObject(entry, reply);
+    entry->replaceHttpReply(reply);
 
     haveParsedReplyHeaders();
 
@@ -1992,7 +1992,7 @@ HttpStateData::icapAclCheckDone(ICAPServiceRep::Pointer service)
 
     if (service == NULL) {
         // handle case where no service is selected;
-        storeEntryReplaceObject(entry, reply);
+        entry->replaceHttpReply(reply);
 
         haveParsedReplyHeaders();
         processReplyBody();
@@ -2042,7 +2042,7 @@ HttpStateData::takeAdaptedHeaders(HttpReply *rep)
     }
 
     assert (rep);
-    storeEntryReplaceObject(entry, rep);
+    entry->replaceHttpReply(rep);
     HTTPMSGUNLOCK(reply);
 
     reply = HTTPMSGLOCK(rep);

diff --git a/src/internal.cc b/src/internal.cc
index 5b20febacf2c8733293f0b6cd6357316c857bc28..1eb67af8aa90e7618c90a30c53535753d94042e8 100644 (file)
--- a/src/internal.cc
+++ b/src/internal.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: internal.cc,v 1.36 2006/02/17 18:10:59 wessels Exp $
+ * $Id: internal.cc,v 1.37 2006/02/17 20:15:35 wessels Exp $
  *
  * DEBUG: section 76    Internal Squid Object handling
  * AUTHOR: Duane, Alex, Henrik
@@ -70,7 +70,7 @@ internalStart(HttpRequest * request, StoreEntry * entry)
                           strlen(msgbuf),
                           squid_curtime,
                           -2);
-        storeEntryReplaceObject(entry, reply);
+        entry->replaceHttpReply(reply);
         storeAppend(entry, msgbuf, strlen(msgbuf));
         entry->complete();
     } else {

diff --git a/src/mime.cc b/src/mime.cc
index 6d811e1e57eea368bf16957f18ad9ecbcfd0a2e6..9d36b6dc3b4c33738ab92ee5597b8c0a6a6b0279 100644 (file)
--- a/src/mime.cc
+++ b/src/mime.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: mime.cc,v 1.122 2006/02/17 18:10:59 wessels Exp $
+ * $Id: mime.cc,v 1.123 2006/02/17 20:15:35 wessels Exp $
  *
  * DEBUG: section 25    MIME Parsing
  * AUTHOR: Harvest Derived
@@ -620,7 +620,7 @@ MimeIcon::created (StoreEntry *newEntry)
 
     httpHeaderPutCc(&reply->header, reply->cache_control);
 
-    storeEntryReplaceObject(e, reply);
+    e->replaceHttpReply(reply);
 
     /* read the file into the buffer and append it to store */
     buf = (char *)memAllocate(MEM_4K_BUF);

diff --git a/src/net_db.cc b/src/net_db.cc
index c744da05f0f3334042b8a7170db83df81ef79dca..bc7b05a27c7a9fe79ef62ec3aaa01481b48b61f2 100644 (file)
--- a/src/net_db.cc
+++ b/src/net_db.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: net_db.cc,v 1.182 2006/02/17 18:10:59 wessels Exp $
+ * $Id: net_db.cc,v 1.183 2006/02/17 20:15:35 wessels Exp $
  *
  * DEBUG: section 38    Network Measurement Database
  * AUTHOR: Duane Wessels
@@ -1210,7 +1210,7 @@ netdbBinaryExchange(StoreEntry * s)
     storeBuffer(s);
     HttpVersion version(1, 0);
     reply->setHeaders(version, HTTP_OK, "OK", NULL, -1, squid_curtime, -2);
-    storeEntryReplaceObject(s, reply);
+    s->replaceHttpReply(reply);
     rec_sz = 0;
     rec_sz += 1 + sizeof(addr.s_addr);
     rec_sz += 1 + sizeof(int);
@@ -1270,7 +1270,7 @@ netdbBinaryExchange(StoreEntry * s)
     HttpVersion version(1,0);
     reply->setHeaders(version, HTTP_BAD_REQUEST, "Bad Request",
                       NULL, -1, squid_curtime, -2);
-    storeEntryReplaceObject(s, reply);
+    s->replaceHttpReply(reply);
     storeAppendPrintf(s, "NETDB support not compiled into this Squid cache.\n");
 #endif
 

diff --git a/src/store.cc b/src/store.cc
index 866d7bdb3588e3497f71e45ebbb2dbca43081cca..5ebc39b2f2577e08cdb7ee0af0187d46de813369 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.583 2006/01/23 20:04:24 wessels Exp $
+ * $Id: store.cc,v 1.584 2006/02/17 20:15:35 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager
  * AUTHOR: Harvest Derived
@@ -1755,19 +1755,14 @@ storeSwapFileNumberSet(StoreEntry * e, sfileno filn)
 #endif
 
 
-/* Replace a store entry with
+/*
+ * Replace a store entry with
  * a new reply. This eats the reply.
  */
-void
-storeEntryReplaceObject(StoreEntry * e, HttpReply * rep)
-{
-    e->replaceHttpReply(rep);
-}
-
 void
 StoreEntry::replaceHttpReply(HttpReply *rep)
 {
-    debug(20, 3) ("storeEntryReplaceObject: %s\n", storeUrl(this));
+    debug(20, 3) ("StoreEntry::replaceHttpReply: %s\n", storeUrl(this));
     Packer p;
 
     if (!mem_obj) {
@@ -1777,14 +1772,6 @@ StoreEntry::replaceHttpReply(HttpReply *rep)
 
     mem_obj->replaceHttpReply(rep);
 
-#if OLD
-    /* TODO: check that there is at most 1 store client ? */
-    HttpReply *myrep = (HttpReply *)e->getReply(); /* we are allowed to do this */
-
-    /* move info to the mem_obj->reply */
-    myrep->absorb(rep);
-#endif
-
     /* TODO: when we store headers serparately remove the header portion */
     /* TODO: mark the length of the headers ? */
     /* We ONLY want the headers */

diff --git a/src/store_digest.cc b/src/store_digest.cc
index eadd1e2950effb9d2e1494201aa4c7f6d9da7ac1..f340fc28e9219b2f52e662d6b9b3734fff22e59a 100644 (file)
--- a/src/store_digest.cc
+++ b/src/store_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_digest.cc,v 1.62 2006/02/17 18:10:59 wessels Exp $
+ * $Id: store_digest.cc,v 1.63 2006/02/17 20:15:35 wessels Exp $
  *
  * DEBUG: section 71    Store Digest Manager
  * AUTHOR: Alex Rousskov
@@ -431,7 +431,7 @@ storeDigestRewriteResume(void)
     debug(71, 3) ("storeDigestRewrite: entry expires on %ld (%+d)\n",
                   (long int) rep->expires, (int) (rep->expires - squid_curtime));
     storeBuffer(e);
-    storeEntryReplaceObject(e, rep);
+    e->replaceHttpReply(rep);
     storeDigestCBlockSwapOut(e);
     storeBufferFlush(e);
     eventAdd("storeDigestSwapOutStep", storeDigestSwapOutStep, sd_state.rewrite_lock, 0.0, 1);

diff --git a/src/urn.cc b/src/urn.cc
index ae695f1898a39b791458de2f5831e1db5ba3d4ce..ac3388a6f3d739946976f24aad6f5542f098ff22 100644 (file)
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: urn.cc,v 1.95 2006/02/17 18:10:59 wessels Exp $
+ * $Id: urn.cc,v 1.96 2006/02/17 20:15:35 wessels Exp $
  *
  * DEBUG: section 52    URN Parsing
  * AUTHOR: Kostas Anagnostakis
@@ -448,7 +448,7 @@ urnHandleReply(void *data, StoreIOBuffer result)
 
     httpBodySet(&rep->body, mb);
     /* don't clean or delete mb; rep->body owns it now */
-    storeEntryReplaceObject(e, rep);
+    e->replaceHttpReply(rep);
     e->complete();
 
     for (i = 0; i < urlcnt; i++) {

diff --git a/src/whois.cc b/src/whois.cc
index 3495553e2fc8146e3a0983bbfe2b7900889bf1b7..c07017165aa41c71fee4bc68d3fc82d616b1a5ca 100644 (file)
--- a/src/whois.cc
+++ b/src/whois.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: whois.cc,v 1.32 2006/01/03 17:22:31 wessels Exp $
+ * $Id: whois.cc,v 1.33 2006/02/17 20:15:35 wessels Exp $
  *
  * DEBUG: section 75    WHOIS protocol
  * AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -123,7 +123,7 @@ WhoisState::setReplyToOK(StoreEntry *entry)
     storeBuffer(entry);
     HttpVersion version(1, 0);
     reply->setHeaders(version, HTTP_OK, "Gatewaying", "text/plain", -1, -1, -2);
-    storeEntryReplaceObject (entry, reply);
+    entry->replaceHttpReply(reply);
 }
 
 void