From: Automatic source maintenance Date: Sat, 29 May 2010 01:39:35 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_3_1_4~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f8c3b8495f2f942542c2b1423b8d53cadc351a6;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/adaptation/ecap/ServiceRep.cc b/src/adaptation/ecap/ServiceRep.cc index 0961cb8410..41708bc573 100644 --- a/src/adaptation/ecap/ServiceRep.cc +++ b/src/adaptation/ecap/ServiceRep.cc @@ -94,7 +94,7 @@ void Adaptation::Ecap::ServiceRep::detach() { isDetached = true; } - + bool Adaptation::Ecap::ServiceRep::detached() const { return isDetached; @@ -121,7 +121,7 @@ Adaptation::Ecap::RegisterAdapterService(const Adaptation::Ecap::ServiceRep::Ada if (adapterService->uri() == (*s)->uri()) { *s = adapterService; debugs(93, 3, "updated eCAP module service: " << - adapterService->uri()); + adapterService->uri()); return; } } @@ -148,14 +148,14 @@ Adaptation::Ecap::CheckUnusedAdapterServices(const Adaptation::Services& cfgs) { typedef std::list::const_iterator ASCI; for (ASCI loaded = TheServices.begin(); loaded != TheServices.end(); - ++loaded) { + ++loaded) { bool found = false; for (Services::const_iterator cfged = cfgs.begin(); - cfged != cfgs.end() && !found; ++cfged) { + cfged != cfgs.end() && !found; ++cfged) { found = (*cfged)->cfg().uri == (*loaded)->uri().c_str(); } if (!found) debugs(93, 1, "Warning: loaded eCAP service has no matching " << - "ecap_service config option: " << (*loaded)->uri()); + "ecap_service config option: " << (*loaded)->uri()); } } diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc index 1a621f8c51..fe45a6a758 100644 --- a/src/adaptation/icap/ServiceRep.cc +++ b/src/adaptation/icap/ServiceRep.cc @@ -456,7 +456,7 @@ const char *Adaptation::Icap::ServiceRep::status() const void Adaptation::Icap::ServiceRep::detach() { debugs(93,3, HERE << "detaching ICAP service: " << cfg().uri << - ' ' << status()); + ' ' << status()); isDetached = true; } diff --git a/src/main.cc b/src/main.cc index 162b04d00e..47d6a261f6 100644 --- a/src/main.cc +++ b/src/main.cc @@ -753,7 +753,7 @@ mainReconfigureFinish(void *) #endif Adaptation::Config::Finalize(enableAdaptation); #endif - + #if ICAP_CLIENT icapLogOpen(); #endif