From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Wed, 2 Mar 2011 18:49:11 +0000 (+0200)
Subject: fix Mgr::Inquirer::applyQueryParams, fix constness in QueryPArams
X-Git-Tag: take06~27^2~127^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22b5be7280287d226727e13536fac719c246dba8;p=thirdparty%2Fsquid.git

fix Mgr::Inquirer::applyQueryParams, fix constness in QueryPArams
---

diff --git a/src/mgr/Inquirer.cc b/src/mgr/Inquirer.cc
index fcf3e333e2..31672c4e14 100644
--- a/src/mgr/Inquirer.cc
+++ b/src/mgr/Inquirer.cc
@@ -142,9 +142,8 @@ Mgr::Inquirer::applyQueryParams(const Ipc::StrandCoords& aStrands, const QueryPa
 {
     Ipc::StrandCoords strands;
 
-    Mgr::Request *cause = static_cast<Mgr::Request *>(request.getRaw());
-    QueryParam::Pointer processesParam = cause->params.queryParams.get("processes");
-    QueryParam::Pointer workersParam = cause->params.queryParams.get("workers");
+    QueryParam::Pointer processesParam = aParams.get("processes");
+    QueryParam::Pointer workersParam = aParams.get("workers");
 
     if (processesParam == NULL || workersParam == NULL) {
         if (processesParam != NULL) {
diff --git a/src/mgr/QueryParams.cc b/src/mgr/QueryParams.cc
index 3a0426b647..34ffb26f1d 100644
--- a/src/mgr/QueryParams.cc
+++ b/src/mgr/QueryParams.cc
@@ -15,10 +15,10 @@
 
 
 Mgr::QueryParam::Pointer
-Mgr::QueryParams::get(const String& name)
+Mgr::QueryParams::get(const String& name) const
 {
     Must(name.size() != 0);
-    Params::iterator pos = find(name);
+    Params::const_iterator pos = find(name);
     return (pos == params.end() ? NULL : pos->second);
 }
 
@@ -52,11 +52,11 @@ Mgr::QueryParams::unpack(const Ipc::TypedMsgHdr& msg)
     }
 }
 
-Mgr::QueryParams::Params::iterator
-Mgr::QueryParams::find(const String& name)
+Mgr::QueryParams::Params::const_iterator
+Mgr::QueryParams::find(const String& name) const
 {
     Must(name.size() != 0);
-    Params::iterator iter = params.begin();
+    Params::const_iterator iter = params.begin();
     for ( ; iter != params.end(); ++iter) {
         if (name.caseCmp(iter->first) == 0)
             break;
diff --git a/src/mgr/QueryParams.h b/src/mgr/QueryParams.h
index 4a9fef093d..1cfa5514d6 100644
--- a/src/mgr/QueryParams.h
+++ b/src/mgr/QueryParams.h
@@ -26,7 +26,7 @@ public:
 
 public:
     /// returns query parameter by name
-    QueryParam::Pointer get(const String& name);
+    QueryParam::Pointer get(const String& name) const;
     void pack(Ipc::TypedMsgHdr& msg) const; ///< store params into msg
     void unpack(const Ipc::TypedMsgHdr& msg); ///< load params from msg
     /// parses the query string parameters
@@ -34,7 +34,7 @@ public:
 
 private:
     /// find query parameter by name
-    Params::iterator find(const String& name);
+    Params::const_iterator find(const String& name) const;
     /// creates a parameter of the specified type
     static QueryParam::Pointer CreateParam(QueryParam::Type aType);
     /// parses string like "param=value"; returns true if success