From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Fri, 14 Dec 2012 01:13:32 +0000 (-0700)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_4_0_1~445
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c304fb9869a786fa14e335db6a28563281dafab;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc b/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
index 3728476176..d8fe9ac8e3 100644
--- a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
+++ b/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
@@ -1167,7 +1167,7 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group)
 
         } else
             ldap_msgfree(res);
-            debug((char *) "%s| %s: DEBUG: Did not find ldap entry for group %s\n", LogTime(), PROGRAM, group);
+        debug((char *) "%s| %s: DEBUG: Did not find ldap entry for group %s\n", LogTime(), PROGRAM, group);
         /*
          * Cleanup
          */
diff --git a/src/base/LruMap.h b/src/base/LruMap.h
index 0875989a24..93473f51f9 100644
--- a/src/base/LruMap.h
+++ b/src/base/LruMap.h
@@ -31,13 +31,12 @@ public:
     };
     typedef std::list<Entry *> Queue;
     typedef typename std::list<Entry *>::iterator QueueIterator;
-    
+
     /// key:queue_item mapping for fast lookups by key
     typedef std::map<std::string, QueueIterator> Map;
     typedef typename Map::iterator MapIterator;
     typedef std::pair<std::string, QueueIterator> MapPair;
 
-
     LruMap(int ttl, size_t size);
     ~LruMap();
     /// Search for an entry, and return a pointer
@@ -59,7 +58,7 @@ public:
 private:
     LruMap(LruMap<EntryValue, EntryCost> const &);
     LruMap<EntryValue, EntryCost> & operator = (LruMap<EntryValue, EntryCost> const &);
-    
+
     bool expired(Entry &e);
     void trim();
     void touch(const MapIterator &i);
@@ -110,7 +109,7 @@ LruMap<EntryValue, EntryCost>::findEntry(const char *key, LruMap::MapIterator &i
     index.push_front(*(i->second));
     index.erase(i->second);
     i->second = index.begin();
-    
+
     LruMap::Entry *e = *i->second;
 
     if (e && expired(*e)) {
@@ -163,7 +162,7 @@ template <class EntryValue, size_t EntryCost>
 bool
 LruMap<EntryValue, EntryCost>::del(LruMap::MapIterator const &i)
 {
-     if (i != storage.end()) {
+    if (i != storage.end()) {
         delete *(i->second);
         index.erase(i->second);
         storage.erase(i);
@@ -186,7 +185,7 @@ template <class EntryValue, size_t EntryCost>
 void
 LruMap<EntryValue, EntryCost>::trim()
 {
-    while(memLimit() > 0 && size() >= memLimit()) {
+    while (memLimit() > 0 && size() >= memLimit()) {
         LruMap::QueueIterator i = index.end();
         --i;
         if (i != index.end()) {
diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc
index 13e7f0293b..5c43612f5b 100644
--- a/src/ssl/helper.cc
+++ b/src/ssl/helper.cc
@@ -186,9 +186,9 @@ void Ssl::CertValidationHelper::Shutdown()
     wordlistDestroy(&ssl_crt_validator->cmdline);
     delete ssl_crt_validator;
     ssl_crt_validator = NULL;
-    
+
     // CertValidationHelper::HelperCache is a static member, it is not good policy to
-    // reset it here. Will work because the current Ssl::CertValidationHelper is 
+    // reset it here. Will work because the current Ssl::CertValidationHelper is
     // always the same static object.
     delete HelperCache;
     HelperCache = NULL;
@@ -216,18 +216,17 @@ sslCrtvdHandleReplyWrapper(void *data, const HelperReply &reply)
         debugs(83, DBG_IMPORTANT, "\"ssl_crtvd\" helper error response: " << reply.other().content());
         validationResponse->resultCode = HelperReply::BrokenHelper;
     } else if (replyMsg.parse(reply.other().content(), reply.other().contentSize()) != Ssl::CrtdMessage::OK ||
-        !replyMsg.parseResponse(*validationResponse, peerCerts, error) ) {
+               !replyMsg.parseResponse(*validationResponse, peerCerts, error) ) {
         debugs(83, DBG_IMPORTANT, "WARNING: Reply from ssl_crtvd for " << " is incorrect");
         debugs(83, DBG_IMPORTANT, "Certificate cannot be validated. ssl_crtvd response: " << replyMsg.getBody());
         validationResponse->resultCode = HelperReply::BrokenHelper;
-    }
-    else
+    } else
         validationResponse->resultCode = reply.result;
 
     crtdvdData->callback(crtdvdData->data, *validationResponse);
 
     if (Ssl::CertValidationHelper::HelperCache &&
-        (validationResponse->resultCode == HelperReply::Okay || validationResponse->resultCode == HelperReply::Error)) {
+            (validationResponse->resultCode == HelperReply::Okay || validationResponse->resultCode == HelperReply::Error)) {
         Ssl::CertValidationHelper::HelperCache->add(crtdvdData->query.c_str(), validationResponse);
     } else
         delete validationResponse;
@@ -270,7 +269,7 @@ void Ssl::CertValidationHelper::sslSubmit(Ssl::CertValidationRequest const &requ
     Ssl::CertValidationResponse const*validationResponse;
 
     if (CertValidationHelper::HelperCache &&
-        (validationResponse = CertValidationHelper::HelperCache->get(crtdvdData->query.c_str()))) {
+            (validationResponse = CertValidationHelper::HelperCache->get(crtdvdData->query.c_str()))) {
         callback(data, *validationResponse);
         cbdataReferenceDone(crtdvdData->data);
         SSL_free(crtdvdData->ssl);