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

SourceFormat Enforcement
---

diff --git a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc
index 838154ac15..7195f62336 100644
--- a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc
+++ b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc
@@ -1338,7 +1338,7 @@ SearchIPLDAP(edui_ldap_t *l)
 // broken?                        xstrncpy(l->userid, ber[j]->bv_val, min(sizeof(l->userid),static_cast<size_t>(ber[j]->bv_len)));
                                 xstrncpy(l->userid, ber[j]->bv_val, sizeof(l->userid));
                                 /* Using bv_len of min() breaks the result by 2 chars */
-			    }
+                            }
                             ldap_value_free_len(l->val);
                             l->val = NULL;
                             ldap_value_free_len(ber);
@@ -1373,7 +1373,7 @@ SearchIPLDAP(edui_ldap_t *l)
 // broken?                        xstrncpy(l->userid, ber[j]->bv_val, min(sizeof(l->userid),static_cast<size_t>(ber[j]->bv_len)));
                                 xstrncpy(l->userid, ber[j]->bv_val, sizeof(l->userid));
                                 /* Using bv_len of min() breaks the result by 2 chars */
-			    }
+                            }
                             ldap_value_free_len(l->val);
                             l->val = NULL;
                             ldap_value_free_len(ber);
@@ -1965,7 +1965,7 @@ MainSafe(int argc, char **argv)
 int
 main(int argc, char **argv)
 {
-	int x;
-	x = MainSafe(argc, argv);
-	return x;
+    int x;
+    x = MainSafe(argc, argv);
+    return x;
 }
diff --git a/src/ssl/ErrorDetail.cc b/src/ssl/ErrorDetail.cc
index 5acf8276d3..27190a5e58 100644
--- a/src/ssl/ErrorDetail.cc
+++ b/src/ssl/ErrorDetail.cc
@@ -8,7 +8,7 @@ struct SslErrorDetailEntry {
     Ssl::ssl_error_t value;
     const char *name;
     const char *detail; ///< for error page %D macro expansion; may contain macros
-    const char *descr; ///< short error description (for use in debug messages or error pages) 
+    const char *descr; ///< short error description (for use in debug messages or error pages)
 };
 
 static const char *SslErrorDetailDefaultStr = "SSL certificate validation error (%err_name): %ssl_subject";
@@ -17,27 +17,27 @@ typedef std::map<Ssl::ssl_error_t, const SslErrorDetailEntry *> SslErrorDetails;
 SslErrorDetails TheSslDetail;
 
 static SslErrorDetailEntry TheSslDetailArray[] = {
-    {X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT, 
-     "X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT",
-     "%err_name: SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name",
-     "Unable to get issuer certificate"},
-    {X509_V_ERR_UNABLE_TO_GET_CRL, 
+    {X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT,
+        "X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT",
+        "%err_name: SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name",
+        "Unable to get issuer certificate"},
+    {X509_V_ERR_UNABLE_TO_GET_CRL,
      "X509_V_ERR_UNABLE_TO_GET_CRL",
      "%err_name: %ssl_error_descr: %ssl_subject",
      "Unable to get certificate CRL"},
-    {X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE, 
+    {X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE,
      "X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE",
      "%err_name: %ssl_error_descr: %ssl_subject",
      "Unable to decrypt certificate's signature"},
-    {X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE, 
+    {X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE,
      "X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE",
      "%err_name: %ssl_error_descr: %ssl_subject",
      "Unable to decrypt CRL's signature"},
-    {X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY, 
+    {X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY,
      "X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY",
      "%err_name: Unable to decode issuer (CA) public key: %ssl_ca_name",
      "Unable to decode issuer public key"},
-    {X509_V_ERR_CERT_SIGNATURE_FAILURE, 
+    {X509_V_ERR_CERT_SIGNATURE_FAILURE,
      "X509_V_ERR_CERT_SIGNATURE_FAILURE",
      "%err_name: %ssl_error_descr: %ssl_subject",
      "Certificate signature failure"},