From: Source Maintenance Date: Thu, 9 Jul 2015 18:12:08 +0000 (+0000) Subject: SourceFormat Enforcement X-Git-Tag: merge-candidate-3-v1~38^2~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ae148ef7b7796a7f3b1aff285f22f859035f650;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/ssl/PeerConnector.cc b/src/ssl/PeerConnector.cc index 1bfaac7973..87689b9c9c 100644 --- a/src/ssl/PeerConnector.cc +++ b/src/ssl/PeerConnector.cc @@ -850,4 +850,3 @@ Ssl::PeekingPeerConnector::serverCertificateVerified() } } - diff --git a/src/ssl/certificate_db.cc b/src/ssl/certificate_db.cc index 4c4d6075ba..fc2cf6197b 100644 --- a/src/ssl/certificate_db.cc +++ b/src/ssl/certificate_db.cc @@ -322,8 +322,8 @@ bool Ssl::CertificateDb::addCertAndPrivateKey(Ssl::X509_Pointer & cert, Ssl::EVP // check db size while trying to minimize calls to size() size_t dbSize = size(); if ((dbSize == 0 && hasRows()) || - (dbSize > 0 && !hasRows()) || - (dbSize > 10 * max_db_size)) { + (dbSize > 0 && !hasRows()) || + (dbSize > 10 * max_db_size)) { // Invalid database size, rebuild dbSize = rebuildSize(); } @@ -332,7 +332,7 @@ bool Ssl::CertificateDb::addCertAndPrivateKey(Ssl::X509_Pointer & cert, Ssl::EVP // and try to find another invalid certificate if needed } // there are no more invalid ones, but there must be valid certificates - while (dbSize > max_db_size){ + while (dbSize > max_db_size) { if (!deleteOldestCertificate()) { rebuildSize(); // No certificates in database.Update the size file. save(); // Some entries may have been removed. Update the index file.