From: Automatic source maintenance Date: Fri, 28 Oct 2011 00:19:03 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: BumpSslServerFirst.take01~63 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c11211d9fdad7a1b200915742560b72dffb03b3e;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc index 63ca74198f..3087372251 100644 --- a/src/DiskIO/IpcIo/IpcIoFile.cc +++ b/src/DiskIO/IpcIo/IpcIoFile.cc @@ -866,7 +866,7 @@ void IpcIoClaimMemoryNeedsRr::run(const RunnerRegistry &) { const int itemsCount = Ipc::FewToFewBiQueue::MaxItemsCount( - ::Config.workers, ::Config.cacheSwap.n_strands, QueueCapacity); + ::Config.workers, ::Config.cacheSwap.n_strands, QueueCapacity); // the maximum number of shared I/O pages is approximately the // number of queue slots, we add a fudge factor to that to account // for corner cases where I/O pages are created before queue diff --git a/src/ssl/support.cc b/src/ssl/support.cc index 6953459e5d..8a04b5386f 100644 --- a/src/ssl/support.cc +++ b/src/ssl/support.cc @@ -1283,10 +1283,10 @@ static X509 * readSslX509CertificatesChain(char const * certFilename, STACK_OF( if (certificate && chain) { - if (X509_check_issued(certificate, certificate) == X509_V_OK) + if (X509_check_issued(certificate, certificate) == X509_V_OK) debugs(83, 5, "Certificate is self-signed, will not be chained"); else { - if(sk_X509_push(chain, certificate)) + if (sk_X509_push(chain, certificate)) CRYPTO_add(&(certificate->references), 1, CRYPTO_LOCK_X509); else debugs(83, DBG_IMPORTANT, "WARNING: unable to add signing certificate to cert chain"); @@ -1297,7 +1297,7 @@ static X509 * readSslX509CertificatesChain(char const * certFilename, STACK_OF( } } } - + return certificate; }