From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Thu, 31 Mar 2011 00:22:13 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: take06~27^2~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa420fc94dc6f15ff6e086a7498b371bfdf93ea3;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/adaptation/ecap/ServiceRep.cc b/src/adaptation/ecap/ServiceRep.cc
index b30e37f06a..2a8fa88bde 100644
--- a/src/adaptation/ecap/ServiceRep.cc
+++ b/src/adaptation/ecap/ServiceRep.cc
@@ -102,12 +102,10 @@ Adaptation::Ecap::ServiceRep::finalize()
         try {
             tryConfigureAndStart();
             Must(up());
-        }
-        catch (const std::exception &e) { // standardized exceptions
+        } catch (const std::exception &e) { // standardized exceptions
             if (!handleFinalizeFailure(e.what()))
                 throw; // rethrow for upper layers to handle
-        }
-        catch (...) { // all other exceptions
+        } catch (...) { // all other exceptions
             if (!handleFinalizeFailure("unrecognized exception"))
                 throw; // rethrow for upper layers to handle
         }
@@ -135,7 +133,7 @@ bool
 Adaptation::Ecap::ServiceRep::handleFinalizeFailure(const char *error)
 {
     const bool salvage = cfg().bypass;
-    const int level = salvage ? DBG_IMPORTANT : DBG_CRITICAL;
+    const int level = salvage ? DBG_IMPORTANT :DBG_CRITICAL;
     const char *kind = salvage ? "optional" : "essential";
     debugs(93, level, "ERROR: failed to start " << kind << " eCAP service: " <<
            cfg().uri << ":\n" << error);
@@ -148,7 +146,7 @@ Adaptation::Ecap::ServiceRep::handleFinalizeFailure(const char *error)
     debugs(93, level, "WARNING: " << kind << " eCAP service is " <<
            "down after initialization failure: " << cfg().uri);
 
-   return true; // tell the caller to ignore the problem because we handled it
+    return true; // tell the caller to ignore the problem because we handled it
 }
 
 bool Adaptation::Ecap::ServiceRep::probed() const