---------------------
PatchSet 1868 
Date: 2005/09/24 05:39:30
Author: rousskov
Branch: squid3-icap
Tag: (none) 
Log:
- Made icapMethod() constant and polished it.
- Made methodStr(IcapMethod) static.

Members: 
	src/ICAPXaction.cc:1.1.2.29->1.1.2.30 
	src/ICAPXaction.h:1.1.2.15->1.1.2.16 

Index: squid3/src/ICAPXaction.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Attic/ICAPXaction.cc,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- squid3/src/ICAPXaction.cc	24 Sep 2005 05:30:34 -0000	1.1.2.29
+++ squid3/src/ICAPXaction.cc	24 Sep 2005 05:39:30 -0000	1.1.2.30
@@ -658,12 +658,13 @@
     }
 }
 
-ICAPXaction::IcapMethod ICAPXaction::icapMethod()
+ICAPXaction::IcapMethod ICAPXaction::icapMethod() const
 {
-    if (dynamic_cast<HttpReply*>(virgin->data->
-                                 header))
+    const HttpMsg *head = virgin->data->header;
+    assert(head);
+    if (dynamic_cast<const HttpReply*>(head))
         return respmod;
-    if (dynamic_cast<HttpRequest*>(virgin->data->header))
+    if (dynamic_cast<const HttpRequest*>(head))
         return reqmod;
     assert(false);
     return none;
Index: squid3/src/ICAPXaction.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Attic/ICAPXaction.h,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- squid3/src/ICAPXaction.h	24 Sep 2005 05:30:34 -0000	1.1.2.15
+++ squid3/src/ICAPXaction.h	24 Sep 2005 05:39:30 -0000	1.1.2.16
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPXaction.h,v 1.1.2.15 2005/09/24 05:30:34 rousskov Exp $
+ * $Id: ICAPXaction.h,v 1.1.2.16 2005/09/24 05:39:30 rousskov Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -117,8 +117,8 @@
 
 private:
     typedef enum { none, reqmod, respmod, options } IcapMethod;
-    IcapMethod icapMethod();
-    const char *methodStr(IcapMethod);
+    IcapMethod icapMethod() const;
+    static const char *methodStr(IcapMethod);
 
 
 private: