Merge to eliminate bad head.
authorDavid Anderson <danderson@mozilla.com>
Wed, 05 Oct 2011 19:52:55 -0700
changeset 20369 48916592d0805940961d6fa77904b25ab95be89d
parent 20368 6e6836fb609f68b25b49b18b06ac2cfc1838a75c
child 20370 96abc634836158f5e60e75e82f90dc361d09948d
push id1209
push usermbanner@mozilla.com
push dateTue, 02 Sep 2014 16:59:36 +0000
treeherdercomm-beta@842e0fd167ee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
Merge to eliminate bad head.
mailnews/mime/src/nsCMS.cpp
--- a/mailnews/mime/src/nsCMS.cpp
+++ b/mailnews/mime/src/nsCMS.cpp
@@ -154,34 +154,34 @@ NS_IMETHODIMP nsCMSMessage::GetSignerCom
   NSSCMSSignerInfo *si = GetTopLevelSignerInfo();
   if (!si)
     return NS_ERROR_FAILURE;
 
   *aName = NSS_CMSSignerInfo_GetSignerCommonName(si);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsCMSMessage::ContentIsEncrypted(PRBool *isEncrypted)
+NS_IMETHODIMP nsCMSMessage::ContentIsEncrypted(bool *isEncrypted)
 {
   nsNSSShutDownPreventionLock locker;
   if (isAlreadyShutDown())
     return NS_ERROR_NOT_AVAILABLE;
 
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::ContentIsEncrypted\n"));
   NS_ENSURE_ARG(isEncrypted);
 
   if (!m_cmsMsg)
     return NS_ERROR_FAILURE;
 
   *isEncrypted = NSS_CMSMessage_IsEncrypted(m_cmsMsg);
 
   return NS_OK;
 }
 
-NS_IMETHODIMP nsCMSMessage::ContentIsSigned(PRBool *isSigned)
+NS_IMETHODIMP nsCMSMessage::ContentIsSigned(bool *isSigned)
 {
   nsNSSShutDownPreventionLock locker;
   if (isAlreadyShutDown())
     return NS_ERROR_NOT_AVAILABLE;
 
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::ContentIsSigned\n"));
   NS_ENSURE_ARG(isSigned);
 
@@ -466,17 +466,17 @@ public:
         }
       }
     }
 
     if (mPoolp)
       PORT_FreeArena(mPoolp, PR_FALSE);
   }
 
-  PRBool allocate(PRUint32 count)
+  bool allocate(PRUint32 count)
   {
     // only allow allocation once
     if (mPoolp)
       return PR_FALSE;
   
     mSize = count;
 
     if (!mSize)
@@ -742,17 +742,17 @@ NS_IMETHODIMP nsCMSMessage::CreateSigned
     if (NSS_CMSSignerInfo_AddMSSMIMEEncKeyPrefs(signerinfo, ecert, 
 	                                    CERT_GetDefaultCertDB())
 	  != SECSuccess) {
       PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CreateSigned - can't add MS smime enc key prefs\n"));
       goto loser;
     }
 
     // If signing and encryption cert are identical, don't add it twice.
-    PRBool addEncryptionCert =
+    bool addEncryptionCert =
       (ecert && (!scert || !CERT_CompareCerts(ecert, scert)));
 
     if (addEncryptionCert &&
         NSS_CMSSignedData_AddCertificate(sigd, ecert) != SECSuccess) {
       PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CreateSigned - can't add own encryption certificate\n"));
       goto loser;
     }
   }