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 5046f8cbbc01c1788fa073ebb6fb32e2544b03c3..0c19df7769b441afec496bea2f9b89ea0c65fdf4 100644 (file)
--- 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 331b22c93c5f15009b7fb72b84e72a2b6ffb0be1..dab12b0dc0a66d59ea127f73544459092c865922 100644 (file)
--- 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 33b853592a355311bf5c7c75f2fe9ccc8103fc84..28250ec188bb28c3115d33c36bb3a83b25027aa9 100644 (file)
--- 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 a84f927d65597518e7c28ce80a3de2ff57be289c..ace040356e42fff056555911bdaac7e021c2c122 100644 (file)
--- 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);