Bug 950169 - remove unused arguments for LogInvalidCertError r=keeler
authorRaymond Etornam Agbeame(:retornam) <mozbugs.retornam@gmail.com>
Fri, 17 Jan 2014 11:57:57 -0800
changeset 164098 f95bc5df7fcfbd8801a8f043a0d9e25148f3bae9
parent 164097 98a42a023afb342ff2bd5d2ebdfa0164aba41c40
child 164099 b7717200fb18b205e69cd88e8e21ce55458e1c86
push id26026
push userphilringnalda@gmail.com
push dateSat, 18 Jan 2014 23:17:27 +0000
treeherdermozilla-central@61fd0f987cf2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskeeler
bugs950169
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 950169 - remove unused arguments for LogInvalidCertError r=keeler
security/manager/ssl/src/SSLServerCertVerification.cpp
--- a/security/manager/ssl/src/SSLServerCertVerification.cpp
+++ b/security/manager/ssl/src/SSLServerCertVerification.cpp
@@ -207,27 +207,22 @@ void StopSSLServerCertVerificationThread
     delete gSSLVerificationPK11Mutex;
     gSSLVerificationPK11Mutex = nullptr;
   }
 }
 
 namespace {
 
 void
-LogInvalidCertError(TransportSecurityInfo *socketInfo, 
-                    const nsACString &host, 
-                    const nsACString &hostWithPort,
-                    int32_t port,
+LogInvalidCertError(TransportSecurityInfo *socketInfo,
                     PRErrorCode errorCode,
-                    ::mozilla::psm::SSLErrorMessageType errorMessageType,
-                    nsIX509Cert* ix509)
+                    ::mozilla::psm::SSLErrorMessageType errorMessageType)
 {
   nsString message;
   socketInfo->GetErrorLogMessage(errorCode, errorMessageType, message);
-  
   if (!message.IsEmpty()) {
     nsContentUtils::LogSimpleConsoleError(message, "SSL");
   }
 }
 
 // Dispatched to the STS thread to notify the infoObject of the verification
 // result.
 //
@@ -419,22 +414,18 @@ CertErrorRunnable::CheckCertOverrides()
   SSLServerCertVerificationResult *result = 
     new SSLServerCertVerificationResult(mInfoObject, 
                                         errorCodeToReport,
                                         Telemetry::HistogramCount,
                                         -1,
                                         OverridableCertErrorMessage);
 
   LogInvalidCertError(mInfoObject,
-                      mInfoObject->GetHostName(),
-                      hostWithPortString,
-                      port,
                       result->mErrorCode,
-                      result->mErrorMessageType,
-                      mCert);
+                      result->mErrorMessageType);
 
   return result;
 }
 
 void 
 CertErrorRunnable::RunOnTargetThread()
 {
   MOZ_ASSERT(NS_IsMainThread());