From: rousskov <>
Date: Mon, 23 Jul 2007 22:55:31 +0000 (+0000)
Subject: Removed the "reply" parameter and "this->reply = reply" assignment from
X-Git-Tag: SQUID_3_0_PRE7~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0f92cbf028766e7f5eccfe8bdfc7dc3cd187f58;p=thirdparty%2Fsquid.git

Removed the "reply" parameter and "this->reply = reply" assignment from
Server::setReply() because the actual parameter was always "reply". The
code setReply() replaced did not have the assignment either.

Eventually, the setReply() method needs to be renamed because the reply is
already set when we call it.
---

diff --git a/src/Server.cc b/src/Server.cc
index 5046f8cbbc..0c19df7769 100644
--- a/src/Server.cc
+++ b/src/Server.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: Server.cc,v 1.15 2007/07/19 12:07:41 hno Exp $
+ * $Id: Server.cc,v 1.16 2007/07/23 16:55:31 rousskov Exp $
  *
  * DEBUG:
  * AUTHOR: Duane Wessels
@@ -559,10 +559,8 @@ ServerStateData::icapAclCheckDoneWrapper(ICAPServiceRep::Pointer service, void *
 #endif
 
 void
-ServerStateData::setReply(HttpReply *reply)
+ServerStateData::setReply()
 {
-    this->reply = reply;
-
 #if ICAP_CLIENT
 
     if (TheICAPConfig.onoff) {
diff --git a/src/Server.h b/src/Server.h
index 331b22c93c..dab12b0dc0 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: Server.h,v 1.6 2007/07/19 12:07:41 hno Exp $
+ * $Id: Server.h,v 1.7 2007/07/23 16:55:31 rousskov Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -148,7 +148,7 @@ protected:
 
 protected:
     // Kids use these to stuff data into the response instead of messing with the entry directly
-    void setReply(HttpReply *);
+    void setReply();
     void addReplyBody(const char *buf, ssize_t len);
     size_t replyBodySpace(size_t space = 4096 * 10);
 
diff --git a/src/ftp.cc b/src/ftp.cc
index 33b853592a..28250ec188 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.429 2007/07/19 12:07:41 hno Exp $
+ * $Id: ftp.cc,v 1.430 2007/07/23 16:55:31 rousskov Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -3189,7 +3189,7 @@ FtpStateData::appendSuccessHeader()
     if (mime_enc)
         reply->header.putStr(HDR_CONTENT_ENCODING, mime_enc);
 
-    setReply(reply);
+    setReply();
 }
 
 void
diff --git a/src/http.cc b/src/http.cc
index a84f927d65..ace040356e 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.532 2007/07/19 12:07:41 hno Exp $
+ * $Id: http.cc,v 1.533 2007/07/23 16:55:31 rousskov Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -754,7 +754,7 @@ HttpStateData::processReplyHeader()
      * Parse the header and remove all referenced headers
      */
 
-    setReply(reply);
+    setReply();
 
     ctx_exit(ctx);