Bug 1558595 - Follow-up: reformat. rs=reformat
authorJorg K <jorgk@jorgk.com>
Sat, 29 Jun 2019 09:20:39 +0200
changeset 35981 c2eb3b629b42c7315b241707bf183151444e63df
parent 35980 8004d6357d550653d32a5baf9d004a02e0dbad3b
child 35982 0e2572d4a88f1525e86de53027d4ac730164a600
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersreformat
bugs1558595
Bug 1558595 - Follow-up: reformat. rs=reformat
mailnews/mime/src/mimecms.cpp
mailnews/mime/src/mimemcms.cpp
--- a/mailnews/mime/src/mimecms.cpp
+++ b/mailnews/mime/src/mimecms.cpp
@@ -219,18 +219,18 @@ class nsSMimeVerificationListener : publ
   nsCString mSenderAddr;
   nsCString mSenderName;
 };
 
 class SignedStatusRunnable : public mozilla::Runnable {
  public:
   SignedStatusRunnable(
       const nsMainThreadPtrHandle<nsIMsgSMIMEHeaderSink> &aSink,
-      int32_t aNestingLevel, int32_t aSignatureStatus,
-      nsIX509Cert *aSignerCert, const nsCString &aMsgNeckoURL);
+      int32_t aNestingLevel, int32_t aSignatureStatus, nsIX509Cert *aSignerCert,
+      const nsCString &aMsgNeckoURL);
   NS_DECL_NSIRUNNABLE
   nsresult mResult;
 
  protected:
   nsMainThreadPtrHandle<nsIMsgSMIMEHeaderSink> m_sink;
   int32_t m_nestingLevel;
   int32_t m_signatureStatus;
   nsCOMPtr<nsIX509Cert> m_signerCert;
@@ -244,19 +244,18 @@ SignedStatusRunnable::SignedStatusRunnab
     : mozilla::Runnable("SignedStatusRunnable"),
       m_sink(aSink),
       m_nestingLevel(aNestingLevel),
       m_signatureStatus(aSignatureStatus),
       m_signerCert(aSignerCert),
       m_msgNeckoURL(aMsgNeckoURL) {}
 
 NS_IMETHODIMP SignedStatusRunnable::Run() {
-  mResult =
-      m_sink->SignedStatus(m_nestingLevel, m_signatureStatus, m_signerCert,
-                           m_msgNeckoURL);
+  mResult = m_sink->SignedStatus(m_nestingLevel, m_signatureStatus,
+                                 m_signerCert, m_msgNeckoURL);
   return NS_OK;
 }
 
 nsresult ProxySignedStatus(
     const nsMainThreadPtrHandle<nsIMsgSMIMEHeaderSink> &aSink,
     int32_t aNestingLevel, int32_t aSignatureStatus, nsIX509Cert *aSignerCert,
     const nsCString &aMsgNeckoURL) {
   RefPtr<SignedStatusRunnable> signedStatus = new SignedStatusRunnable(
@@ -527,18 +526,18 @@ void MimeCMSGetFromSender(MimeObject *ob
   if (!s.IsEmpty())
     ExtractFirstAddress(EncodedHeader(s), sender_name, sender_addr);
 }
 
 void MimeCMSRequestAsyncSignatureVerification(
     nsICMSMessage *aCMSMsg, const char *aFromAddr, const char *aFromName,
     const char *aSenderAddr, const char *aSenderName,
     nsIMsgSMIMEHeaderSink *aHeaderSink, int32_t aMimeNestingLevel,
-    const nsCString &aMsgNeckoURL,
-    unsigned char *item_data, uint32_t item_len, int16_t digest_type) {
+    const nsCString &aMsgNeckoURL, unsigned char *item_data, uint32_t item_len,
+    int16_t digest_type) {
   RefPtr<nsSMimeVerificationListener> listener =
       new nsSMimeVerificationListener(aFromAddr, aFromName, aSenderAddr,
                                       aSenderName, aHeaderSink,
                                       aMimeNestingLevel, aMsgNeckoURL);
   if (item_data)
     aCMSMsg->AsyncVerifyDetachedSignature(listener, item_data, item_len,
                                           digest_type);
   else
--- a/mailnews/mime/src/mimemcms.cpp
+++ b/mailnews/mime/src/mimemcms.cpp
@@ -109,18 +109,18 @@ extern void MimeCMSGetFromSender(MimeObj
                                  nsCString &from_name, nsCString &sender_addr,
                                  nsCString &sender_name);
 extern bool MimeCMSHeadersAndCertsMatch(
     MimeObject *obj, nsICMSMessage *, bool *signing_cert_without_email_address);
 extern void MimeCMSRequestAsyncSignatureVerification(
     nsICMSMessage *aCMSMsg, const char *aFromAddr, const char *aFromName,
     const char *aSenderAddr, const char *aSenderName,
     nsIMsgSMIMEHeaderSink *aHeaderSink, int32_t aMimeNestingLevel,
-    const nsCString &aMsgNeckoURL,
-    unsigned char *item_data, uint32_t item_len, int16_t digest_type);
+    const nsCString &aMsgNeckoURL, unsigned char *item_data, uint32_t item_len,
+    int16_t digest_type);
 extern char *MimeCMS_MakeSAURL(MimeObject *obj);
 extern char *IMAP_CreateReloadAllPartsUrl(const char *url);
 extern int MIMEGetRelativeCryptoNestLevel(MimeObject *obj);
 
 static void *MimeMultCMS_init(MimeObject *obj) {
   MimeHeaders *hdrs = obj->headers;
   MimeMultCMSdata *data = 0;
   char *ct, *micalg;
@@ -405,18 +405,18 @@ static char *MimeMultCMS_generate(void *
   nsCString sender_addr;
   nsCString sender_name;
 
   MimeCMSGetFromSender(data->self, from_addr, from_name, sender_addr,
                        sender_name);
 
   MimeCMSRequestAsyncSignatureVerification(
       data->content_info, from_addr.get(), from_name.get(), sender_addr.get(),
-      sender_name.get(), data->smimeHeaderSink, aRelativeNestLevel,
-      data->url, data->item_data, data->item_len, data->hash_type);
+      sender_name.get(), data->smimeHeaderSink, aRelativeNestLevel, data->url,
+      data->item_data, data->item_len, data->hash_type);
 
   if (data->content_info) {
 #if 0  // XXX Fix this. What do we do here? //
     if (SEC_CMSContainsCertsOrCrls(data->content_info))
     {
       /* #### call libsec telling it to import the certs */
     }
 #endif