From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Thu, 3 Feb 2011 08:02:28 +0000 (+0200)
Subject: Applying sourceformating
X-Git-Tag: take03^2~37^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fb5a96c4cc2e2b677f8d3b3a3c9ac3c4496ac6a;p=thirdparty%2Fsquid.git

Applying sourceformating
---

diff --git a/src/ipc/Forwarder.cc b/src/ipc/Forwarder.cc
index f60515a805..3650229a2d 100644
--- a/src/ipc/Forwarder.cc
+++ b/src/ipc/Forwarder.cc
@@ -19,8 +19,8 @@ Ipc::Forwarder::RequestsMap Ipc::Forwarder::TheRequestsMap;
 unsigned int Ipc::Forwarder::LastRequestId = 0;
 
 Ipc::Forwarder::Forwarder(Request::Pointer aRequest, double aTimeout):
-    AsyncJob("Ipc::Forwarder"),
-    request(aRequest), timeout(aTimeout)
+        AsyncJob("Ipc::Forwarder"),
+        request(aRequest), timeout(aTimeout)
 {
     debugs(54, 5, HERE);
 }
diff --git a/src/ipc/Inquirer.cc b/src/ipc/Inquirer.cc
index 9c6e123d89..d80dce5e3a 100644
--- a/src/ipc/Inquirer.cc
+++ b/src/ipc/Inquirer.cc
@@ -29,8 +29,8 @@ LesserStrandByKidId(const Ipc::StrandCoord &c1, const Ipc::StrandCoord &c2)
 
 Ipc::Inquirer::Inquirer(Request::Pointer aRequest, const StrandCoords& coords,
                         double aTimeout):
-    AsyncJob("Ipc::Inquirer"),
-    request(aRequest), strands(coords), pos(strands.begin()), timeout(aTimeout)
+        AsyncJob("Ipc::Inquirer"),
+        request(aRequest), strands(coords), pos(strands.begin()), timeout(aTimeout)
 {
     debugs(54, 5, HERE);
 
diff --git a/src/ipc/Request.h b/src/ipc/Request.h
index 1711ff2164..f56aad3fbf 100644
--- a/src/ipc/Request.h
+++ b/src/ipc/Request.h
@@ -23,7 +23,7 @@ public:
 
 public:
     Request(int aRequestorId, unsigned int aRequestId):
-        requestorId(aRequestorId), requestId(aRequestId) {}
+            requestorId(aRequestorId), requestId(aRequestId) {}
 
     virtual void pack(TypedMsgHdr& msg) const = 0; ///< prepare for sendmsg()
     virtual Pointer clone() const = 0; ///< returns a copy of this
diff --git a/src/ipc/Response.h b/src/ipc/Response.h
index edbf2a971e..1ae2f8a7bf 100644
--- a/src/ipc/Response.h
+++ b/src/ipc/Response.h
@@ -23,7 +23,7 @@ public:
 
 public:
     explicit Response(unsigned int aRequestId):
-        requestId(aRequestId) {}
+            requestId(aRequestId) {}
 
     virtual void pack(TypedMsgHdr& msg) const = 0; ///< prepare for sendmsg()
     virtual Pointer clone() const = 0; ///< returns a copy of this
diff --git a/src/mgr/Request.cc b/src/mgr/Request.cc
index 15d8bd066e..9e6f76e834 100644
--- a/src/mgr/Request.cc
+++ b/src/mgr/Request.cc
@@ -22,13 +22,13 @@ Mgr::Request::Request(int aRequestorId, unsigned int aRequestId, int aFd,
 }
 
 Mgr::Request::Request(const Request& request):
-    Ipc::Request(request.requestorId, request.requestId),
-    fd(request.fd), params(request.params)
+        Ipc::Request(request.requestorId, request.requestId),
+        fd(request.fd), params(request.params)
 {
 }
 
 Mgr::Request::Request(const Ipc::TypedMsgHdr& msg):
-    Ipc::Request(0, 0)
+        Ipc::Request(0, 0)
 {
     msg.checkType(Ipc::mtCacheMgrRequest);
     msg.getPod(requestorId);
diff --git a/src/mgr/Response.cc b/src/mgr/Response.cc
index e7a5866705..38d48865b1 100644
--- a/src/mgr/Response.cc
+++ b/src/mgr/Response.cc
@@ -22,12 +22,12 @@ Mgr::Response::Response(unsigned int aRequestId, Action::Pointer anAction):
 }
 
 Mgr::Response::Response(const Response& response):
-    Ipc::Response(response.requestId), action(response.action)
+        Ipc::Response(response.requestId), action(response.action)
 {
 }
 
 Mgr::Response::Response(const Ipc::TypedMsgHdr& msg):
-    Ipc::Response(0)
+        Ipc::Response(0)
 {
     msg.checkType(Ipc::mtCacheMgrResponse);
     msg.getPod(requestId);
diff --git a/src/snmp/Pdu.cc b/src/snmp/Pdu.cc
index 122856b019..db1af89d28 100644
--- a/src/snmp/Pdu.cc
+++ b/src/snmp/Pdu.cc
@@ -52,8 +52,7 @@ Snmp::Pdu::aggregate(const Pdu& pdu)
     Must(varCount() == pdu.varCount());
     aggrCount++;
     for (variable_list* p_aggr = variables, *p_var = pdu.variables; p_var != NULL;
-         p_aggr = p_aggr->next_variable, p_var = p_var->next_variable)
-    {
+            p_aggr = p_aggr->next_variable, p_var = p_var->next_variable) {
         Must(p_aggr != NULL);
         Var& aggr = static_cast<Var&>(*p_aggr);
         Var& var = static_cast<Var&>(*p_var);
@@ -61,8 +60,7 @@ Snmp::Pdu::aggregate(const Pdu& pdu)
             aggr.setName(var.getName());
             aggr.copyValue(var);
         } else {
-            switch(snmpAggrType(aggr.name, aggr.name_length))
-            {
+            switch (snmpAggrType(aggr.name, aggr.name_length)) {
             case atSum:
             case atAverage:
                 // The mean-average division is done later
@@ -128,8 +126,7 @@ Snmp::Pdu::setVars(variable_list* vars)
 {
     clearVars();
     for (variable_list** p_var = &variables; vars != NULL;
-         vars = vars->next_variable, p_var = &(*p_var)->next_variable)
-    {
+            vars = vars->next_variable, p_var = &(*p_var)->next_variable) {
         *p_var = new Var(static_cast<Var&>(*vars));
     }
 }
@@ -207,8 +204,7 @@ Snmp::Pdu::unpack(const Ipc::TypedMsgHdr& msg)
     msg.getPod(time);
     int count = msg.getInt();
     for (variable_list** p_var = &variables; count > 0;
-         p_var = &(*p_var)->next_variable, --count)
-    {
+            p_var = &(*p_var)->next_variable, --count) {
         Var* var = new Var();
         var->unpack(msg);
         *p_var = var;
@@ -224,14 +220,14 @@ Snmp::Pdu::varCount() const
     return count;
 }
 
-void 
+void
 Snmp::Pdu::fixAggregate()
 {
     if (aggrCount < 2)
         return;
     for (variable_list* p_aggr = variables; p_aggr != NULL; p_aggr = p_aggr->next_variable) {
         Var& aggr = static_cast<Var&>(*p_aggr);
-        if(snmpAggrType(aggr.name, aggr.name_length) == atAverage) {
+        if (snmpAggrType(aggr.name, aggr.name_length) == atAverage) {
             aggr /= aggrCount;
         }
     }
diff --git a/src/snmp/Pdu.h b/src/snmp/Pdu.h
index aad0e00b93..2069539ae9 100644
--- a/src/snmp/Pdu.h
+++ b/src/snmp/Pdu.h
@@ -37,7 +37,7 @@ public:
     void clearVars(); ///< clear variables list
     Range<const oid*> getSystemOid() const;
     void setSystemOid(const Range<const oid*>& systemOid);
-    void clearSystemOid(); 
+    void clearSystemOid();
 
 private:
     void init(); ///< initialize members
diff --git a/src/snmp/Request.cc b/src/snmp/Request.cc
index fabdb13ec0..b204f8c2e9 100644
--- a/src/snmp/Request.cc
+++ b/src/snmp/Request.cc
@@ -14,20 +14,20 @@
 Snmp::Request::Request(int aRequestorId, unsigned int aRequestId,
                        const Pdu& aPdu, const Session& aSession,
                        int aFd, const Ip::Address& anAddress):
-    Ipc::Request(aRequestorId, aRequestId),
-    pdu(aPdu), session(aSession), fd(aFd), address(anAddress)
+        Ipc::Request(aRequestorId, aRequestId),
+        pdu(aPdu), session(aSession), fd(aFd), address(anAddress)
 {
 }
 
 Snmp::Request::Request(const Request& request):
-    Ipc::Request(request.requestorId, request.requestId),
-    pdu(request.pdu), session(request.session),
-    fd(request.fd), address(request.address)
+        Ipc::Request(request.requestorId, request.requestId),
+        pdu(request.pdu), session(request.session),
+        fd(request.fd), address(request.address)
 {
 }
 
 Snmp::Request::Request(const Ipc::TypedMsgHdr& msg):
-    Ipc::Request(0, 0)
+        Ipc::Request(0, 0)
 {
     msg.checkType(Ipc::mtSnmpRequest);
     msg.getPod(requestorId);
diff --git a/src/snmp/Request.h b/src/snmp/Request.h
index f11cfa7723..f515b0b2ab 100644
--- a/src/snmp/Request.h
+++ b/src/snmp/Request.h
@@ -23,7 +23,7 @@ class Request: public Ipc::Request
 {
 public:
     Request(int aRequestorId, unsigned int aRequestId, const Pdu& aPdu,
-        const Session& aSession, int aFd, const Ip::Address& anAddress);
+            const Session& aSession, int aFd, const Ip::Address& anAddress);
 
     explicit Request(const Ipc::TypedMsgHdr& msg); ///< from recvmsg()
     /* Ipc::Request API */
@@ -35,7 +35,7 @@ private:
 
 public:
     Pdu pdu; ///< SNMP protocol data unit
-    Session session; ///< SNMP session 
+    Session session; ///< SNMP session
     int fd; ///< client connection descriptor
     Ip::Address address; ///< client address
 };
diff --git a/src/snmp/Response.cc b/src/snmp/Response.cc
index aca9646993..0128f16a87 100644
--- a/src/snmp/Response.cc
+++ b/src/snmp/Response.cc
@@ -19,17 +19,17 @@ std::ostream& Snmp::operator << (std::ostream& os, const Response& response)
 }
 
 Snmp::Response::Response(unsigned int aRequestId):
-    Ipc::Response(aRequestId), pdu()
+        Ipc::Response(aRequestId), pdu()
 {
 }
 
 Snmp::Response::Response(const Response& response):
-    Ipc::Response(response.requestId), pdu(response.pdu)
+        Ipc::Response(response.requestId), pdu(response.pdu)
 {
 }
 
 Snmp::Response::Response(const Ipc::TypedMsgHdr& msg):
-    Ipc::Response(0)
+        Ipc::Response(0)
 {
     msg.checkType(Ipc::mtSnmpResponse);
     msg.getPod(requestId);
diff --git a/src/snmp/Response.h b/src/snmp/Response.h
index 2f7e4b086d..b2bf360298 100644
--- a/src/snmp/Response.h
+++ b/src/snmp/Response.h
@@ -16,7 +16,7 @@
 namespace Snmp
 {
 
-/// 
+///
 class Response: public Ipc::Response
 {
 public:
diff --git a/src/snmp/Var.cc b/src/snmp/Var.cc
index 70155e0478..3a6a6b982f 100644
--- a/src/snmp/Var.cc
+++ b/src/snmp/Var.cc
@@ -45,8 +45,7 @@ Snmp::Var::init()
 Snmp::Var&
 Snmp::Var::operator += (const Var& var)
 {
-    switch(type)
-    {
+    switch (type) {
     case SMI_INTEGER:
         setInt(asInt() + var.asInt());
         break;
@@ -74,8 +73,7 @@ Snmp::Var&
 Snmp::Var::operator /= (int num)
 {
     Must(num != 0);
-    switch(type)
-    {
+    switch (type) {
     case SMI_INTEGER:
         setInt(asInt() / num);
         break;
@@ -102,8 +100,7 @@ Snmp::Var::operator /= (int num)
 bool
 Snmp::Var::operator < (const Var& var) const
 {
-    switch(type)
-    {
+    switch (type) {
     case SMI_INTEGER:
         return asInt() < var.asInt();
     case SMI_GAUGE32:
@@ -125,8 +122,7 @@ Snmp::Var::operator < (const Var& var) const
 bool
 Snmp::Var::operator > (const Var& var) const
 {
-    switch(type)
-    {
+    switch (type) {
     case SMI_INTEGER:
         return asInt() > var.asInt();
     case SMI_GAUGE32:
diff --git a/src/snmp/Var.h b/src/snmp/Var.h
index 7d50e89788..bd0adb2367 100644
--- a/src/snmp/Var.h
+++ b/src/snmp/Var.h
@@ -31,7 +31,7 @@ public:
     Var& operator /= (int num);
     bool operator < (const Var& var) const;
     bool operator > (const Var& var) const;
-    
+
     void pack(Ipc::TypedMsgHdr& msg) const; ///< prepare for sendmsg()
     void unpack(const Ipc::TypedMsgHdr& msg); ///< restore struct from the message
 
diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index 0890ab4769..fb300d2ed2 100644
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -162,11 +162,11 @@ snmpInit(void)
     snmpAddNodeStr("1.3.6.1.4.1.3495.1.3.1", PERF_SYS_NUMOBJCNT, snmp_prfSysFn, static_Inst, atSum);
     /*
       Amos comments:
-      The meaning of LRU is "oldest timestamped object in cache,  if LRU algorithm is 
+      The meaning of LRU is "oldest timestamped object in cache,  if LRU algorithm is
       used"...
-      What this SMP support needs to do is aggregate via a special filter equivalent to 
-      min() to retain the semantic oldest-object meaning. A special one is needed that 
-      works as unsigned and ignores '0' values. 
+      What this SMP support needs to do is aggregate via a special filter equivalent to
+      min() to retain the semantic oldest-object meaning. A special one is needed that
+      works as unsigned and ignores '0' values.
      */
     snmpAddNodeStr("1.3.6.1.4.1.3495.1.3.1", PERF_SYS_CURLRUEXP, snmp_prfSysFn, static_Inst);
     snmpAddNodeStr("1.3.6.1.4.1.3495.1.3.1", PERF_SYS_CURUNLREQ, snmp_prfSysFn, static_Inst, atSum);
@@ -532,7 +532,7 @@ snmpConstructReponse(snmp_request_t * rq)
 
     if (UsingSmp() && IamWorkerProcess()) {
         AsyncJob::Start(new Snmp::Forwarder(static_cast<Snmp::Pdu&>(*rq->PDU),
-            static_cast<Snmp::Session&>(rq->session), rq->sock, rq->from));
+                                            static_cast<Snmp::Session&>(rq->session), rq->sock, rq->from));
         snmp_free_pdu(rq->PDU);
         return;
     }