Bug 1399756 - white-space clean-up in mailnews/compose/src/nsMsgAppleDouble.h. rs=white-space-only
authorJorg K <jorgk@jorgk.com>
Tue, 26 Sep 2017 00:51:29 +0200
changeset 29047 2434e5fd8480accdadfed0e52759cd992425bf15
parent 29046 f9af05463902187f17613110616326aff2cd4387
child 29048 8f431a95645cdf312393eac5f0a2ad5a57839706
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhite-space-only
bugs1399756
Bug 1399756 - white-space clean-up in mailnews/compose/src/nsMsgAppleDouble.h. rs=white-space-only
mailnews/compose/src/nsMsgAppleDouble.h
mailnews/db/msgdb/public/nsDBFolderInfo.h
mailnews/db/msgdb/public/nsMailDatabase.h
mailnews/db/msgdb/public/nsMsgHdr.h
mailnews/db/msgdb/public/nsMsgThread.h
mailnews/db/msgdb/public/nsNewsDatabase.h
mailnews/db/msgdb/src/nsImapMailDatabase.cpp
mailnews/db/msgdb/src/nsMailDatabase.cpp
mailnews/db/msgdb/src/nsMsgDatabase.cpp
mailnews/db/msgdb/src/nsMsgHdr.cpp
--- a/mailnews/compose/src/nsMsgAppleDouble.h
+++ b/mailnews/compose/src/nsMsgAppleDouble.h
@@ -1,207 +1,200 @@
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
-*   AppleDouble.h
-*	-------------
-*
-*  	  The header file for a stream based apple single/double encodor/decodor.
-*		
-*		2aug95	mym		
-*		
-*/
-
+ * AppleDouble.h
+ * -------------
+ *
+ * The header file for a stream based apple single/double encodor/decodor.
+ *
+ * 2aug95    mym
+ *
+ */
 
 #ifndef AppleDouble_h
 #define AppleDouble_h
 
 #include "msgCore.h"
 #include "nsComposeStrings.h"
 #include "nsIOutputStream.h"
 #include "nsCOMPtr.h"
 
 #include <CoreServices/CoreServices.h>
 
-#define NOERR			0
-#define errDone			1
-								/* Done with current operation.	*/
-#define errEOB			2
-								/* 	End of a buffer.			*/
-#define errEOP			3	
-								/* 	End of a Part.				*/
+#define NOERR            0
+#define errDone          1  /* Done with current operation. */
+#define errEOB           2  /* End of a buffer.             */
+#define errEOP           3  /* End of a Part.               */
 
-					
-#define errFileOpen	NS_ERROR_GET_CODE(NS_MSG_UNABLE_TO_OPEN_TMP_FILE)
-#define errFileWrite	-202 /*Error writing temporary file.*/
-#define errUsrCancel	-2  /*MK_INTERRUPTED */
-#define errDecoding		-1
+
+#define errFileOpen    NS_ERROR_GET_CODE(NS_MSG_UNABLE_TO_OPEN_TMP_FILE)
+#define errFileWrite   -202  /* Error writing temporary file. */
+#define errUsrCancel     -2  /* MK_INTERRUPTED */
+#define errDecoding      -1
 
 /*
-** The envirment block data type.
-*/
+ ** The envirment block data type.
+ */
 enum
 {
-	kInit,
-	kDoingHeaderPortion,
-	kDoneHeaderPortion,
-	kDoingDataPortion,
-	kDoneDataPortion
+  kInit,
+  kDoingHeaderPortion,
+  kDoneHeaderPortion,
+  kDoingDataPortion,
+  kDoneDataPortion
 };
 
 typedef struct _appledouble_encode_object
 {
-    char    fname[256];
-    FSIORefNum fileId;				/* the id for the open file (data/resource fork) */
+  char    fname[256];
+  FSIORefNum fileId;         /* the id for the open file (data/resource fork) */
 
-	int 	state;
-	int		text_file_type;		/* if the file has a text file type with it.	*/
-	char	*boundary;			/* the boundary string.							*/
+  int     state;
+  int     text_file_type;    /* if the file has a text file type with it.     */
+  char    *boundary;         /* the boundary string.                          */
 
-	int		status;				/* the error code if anyerror happens.			*/
-	char 	b_overflow[200];
-	int		s_overflow;
-	
-	int		state64;			/* the left over state of base64 enocding 		*/
-	int		ct;					/* the character count of base64 encoding		*/
-	int 	c1, c2;				/* the left of the last base64 encoding 		*/		
+  int     status;            /* the error code if anyerror happens.           */
+  char    b_overflow[200];
+  int     s_overflow;
 
-	char 	*outbuff;			/* the outbuff by the caller.           		*/
-	int		s_outbuff;			/* the size of the buffer.						*/
-	int		pos_outbuff;		/* the offset in the current buffer.			*/
+  int     state64;           /* the left over state of base64 enocding        */
+  int     ct;                /* the character count of base64 encoding        */
+  int     c1, c2;            /* the left of the last base64 encoding          */
 
+  char    *outbuff;          /* the outbuff by the caller.                    */
+  int     s_outbuff;         /* the size of the buffer.                       */
+  int     pos_outbuff;       /* the offset in the current buffer.             */
 } appledouble_encode_object;
 
 /* The possible content transfer encodings */
 
 enum
 {
-	kEncodeNone,
-	kEncodeQP,
-	kEncodeBase64,
-	kEncodeUU
+  kEncodeNone,
+  kEncodeQP,
+  kEncodeBase64,
+  kEncodeUU
 };
 
 enum
 {
-	kGeneralMine,
-	kAppleDouble,
-	kAppleSingle
+  kGeneralMine,
+  kAppleDouble,
+  kAppleSingle
 };
 
 enum
 {
-	kInline,
-	kDontCare
+  kInline,
+  kDontCare
 };
 
 enum
 {
-	kHeaderPortion,
-	kDataPortion
+  kHeaderPortion,
+  kDataPortion
 };
 
-/* the decode states.	*/
+/* the decode states. */
 enum
 {
-	kBeginParseHeader = 3,
-	kParsingHeader,
-	kBeginSeekBoundary,
-	kSeekingBoundary,
-	kBeginHeaderPortion,
-	kProcessingHeaderPortion,
-	kBeginDataPortion,
-	kProcessingDataPortion,
-	kFinishing
+  kBeginParseHeader = 3,
+  kParsingHeader,
+  kBeginSeekBoundary,
+  kSeekingBoundary,
+  kBeginHeaderPortion,
+  kProcessingHeaderPortion,
+  kBeginDataPortion,
+  kProcessingDataPortion,
+  kFinishing
 };
 
 /* uuencode states */
 enum
 {
-	kWaitingForBegin = (int) 0,
-	kBegin,
-	kMainBody,
-	kEnd
+  kWaitingForBegin = (int) 0,
+  kBegin,
+  kMainBody,
+  kEnd
 };
 
 typedef struct _appledouble_decode_object
 {
-	int		is_binary;
-	int		is_apple_single;	/* if the object encoded is in apple single		*/
-	int		write_as_binhex;
-	
-	int		messagetype;
-	char*	boundary0;			/* the boundary for the enclosure.				*/
-	int		deposition;			/* the deposition.								*/
-	int		encoding;			/* the encoding method.							*/
-	int		which_part;
-	
-	char	fname[256];
-	// nsIOFileStream *fileSpec;					/* the stream for data fork work.					 */
+  int     is_binary;
+  int     is_apple_single;    /* if the object encoded is in apple single  */
+  int     write_as_binhex;
+
+  int     messagetype;
+  char*   boundary0;          /* the boundary for the enclosure.           */
+  int     deposition;         /* the deposition.                           */
+  int     encoding;           /* the encoding method.                      */
+  int     which_part;
+
+  char    fname[256];
+// nsIOFileStream *fileSpec;   /* the stream for data fork work.            */
+
+  int     state;
+
+  int     rksize;             /* the resource fork size count.             */
+  int     dksize;             /* the data fork size count.                 */
 
-	int 	state;
-	
-	int		rksize;				/* the resource fork size count.				*/
-	int		dksize;				/* the data fork size count.					*/
-	
-	int		status;				/* the error code if anyerror happens.			*/
-	char 	b_leftover[256];
-	int		s_leftover;
-	
-	int		encode;				/* the encode type of the message.				*/
-	int		state64;			/* the left over state of base64 enocding 		*/
-	int		left;				/* the character count of base64 encoding		*/
-	int 	c[4];				/* the left of the last base64 encoding 		*/		
-	int		uu_starts_line;		/* is decoder at the start of a line? (uuencode)	*/
-	int		uu_state;			/* state w/r/t the uuencode body */
-	int		uu_bytes_written;	/* bytes written from the current tuple (uuencode) */
-	int		uu_line_bytes;		/* encoded bytes remaining in the current line (uuencode) */
+  int      status;            /* the error code if anyerror happens.       */
+  char     b_leftover[256];
+  int      s_leftover;
 
-	char 	*inbuff;			/* the outbuff by the caller.           		*/
-	int		s_inbuff;			/* the size of the buffer.						*/
-	int		pos_inbuff;			/* the offset in the current buffer.			*/
-
+  int      encode;            /* the encode type of the message.           */
+  int      state64;           /* the left over state of base64 enocding    */
+  int      left;              /* the character count of base64 encoding    */
+  int      c[4];              /* the left of the last base64 encoding      */
+  int      uu_starts_line;    /* is decoder at the start of a line? (uuencode) */
+  int      uu_state;          /* state w/r/t the uuencode body */
+  int      uu_bytes_written;  /* bytes written from the current tuple (uuencode) */
+  int      uu_line_bytes;     /* encoded bytes remaining in the current line (uuencode) */
 
-	nsCOMPtr <nsIFile> tmpFile;		/* the temp file to hold the decode data fork 	*/
-								                      /* when doing the binhex exporting.				*/
-  nsCOMPtr <nsIOutputStream> tmpFileStream; /* The output File Stream */
-	int32_t	            data_size;			/* the size of the data in the tmp file.		*/
+  char     *inbuff;           /* the outbuff by the caller.                */
+  int      s_inbuff;          /* the size of the buffer.                   */
+  int      pos_inbuff;        /* the offset in the current buffer.         */
 
+  nsCOMPtr <nsIFile> tmpFile; /* the temp file to hold the decode data fork */
+                              /* when doing the binhex exporting.          */
+  nsCOMPtr <nsIOutputStream> tmpFileStream; /* The output File Stream      */
+  int32_t  data_size;         /* the size of the data in the tmp file.     */
 } appledouble_decode_object;
 
 
 /*
-**	The protypes.
-*/
+ ** The protypes.
+ */
 
 PR_BEGIN_EXTERN_C
 
 int ap_encode_init(appledouble_encode_object *p_ap_encode_obj,
-					const char* fname,
-					char* separator);
+                   const char* fname,
+                   char* separator);
 
 int ap_encode_next(appledouble_encode_object* p_ap_encode_obj,
-					char 	*to_buff,
-					int32_t 	buff_size,
-					int32_t*	real_size);
+                   char     *to_buff,
+                   int32_t  buff_size,
+                   int32_t* real_size);
 
 int ap_encode_end(appledouble_encode_object* p_ap_encode_obj,
-					bool	is_aborting);
+                   bool is_aborting);
 
 int ap_decode_init(appledouble_decode_object* p_ap_decode_obj,
-					bool	is_apple_single,
-					bool	write_as_bin_hex,
-					void  	*closure);
+                   bool is_apple_single,
+                   bool write_as_bin_hex,
+                   void *closure);
 
 int ap_decode_next(appledouble_decode_object* p_ap_decode_obj,
-					char 	*in_buff,
-					int32_t 	buff_size);
+                   char    *in_buff,
+                   int32_t buff_size);
 
 int ap_decode_end(appledouble_decode_object* p_ap_decode_obj,
-				 	bool is_aborting);
+                  bool is_aborting);
 
 PR_END_EXTERN_C
 
 #endif
--- a/mailnews/db/msgdb/public/nsDBFolderInfo.h
+++ b/mailnews/db/msgdb/public/nsDBFolderInfo.h
@@ -19,38 +19,38 @@
 
 class nsMsgDatabase;
 
 // again, this could inherit from nsISupports, but I don't see the need as of yet.
 // I'm not sure it needs to be ref-counted (but I think it does).
 
 // I think these getters and setters really need to go through mdb and not rely on the object
 // caching the values. If this somehow turns out to be prohibitively expensive, we can invent
-// some sort of dirty mechanism, but I think it turns out that these values will be cached by 
+// some sort of dirty mechanism, but I think it turns out that these values will be cached by
 // the MSG_FolderInfo's anyway.
 class nsDBFolderInfo : public nsIDBFolderInfo
 {
 public:
   friend class nsMsgDatabase;
-  
+
   nsDBFolderInfo(nsMsgDatabase *mdb);
-  
+
   NS_DECL_ISUPPORTS
     // interface methods.
     NS_DECL_NSIDBFOLDERINFO
     // create the appropriate table and row in a new db.
     nsresult			AddToNewMDB();
   // accessor methods.
-  
+
   bool      TestFlag(int32_t flags);
   int16_t   GetIMAPHierarchySeparator() ;
   void      SetIMAPHierarchySeparator(int16_t hierarchyDelimiter) ;
   void      ChangeImapTotalPendingMessages(int32_t delta);
   void      ChangeImapUnreadPendingMessages(int32_t delta) ;
-  
+
   nsresult      InitFromExistingDB();
   // get and set arbitrary property, aka row cell value.
   nsresult SetPropertyWithToken(mdb_token aProperty, const nsAString &propertyStr);
   nsresult SetUint32PropertyWithToken(mdb_token aProperty, uint32_t propertyValue);
   nsresult SetInt64PropertyWithToken(mdb_token aProperty, int64_t propertyValue);
   nsresult SetInt32PropertyWithToken(mdb_token aProperty, int32_t propertyValue);
   nsresult GetPropertyWithToken(mdb_token aProperty, nsAString &propertyValue);
   nsresult GetUint32PropertyWithToken(mdb_token aProperty, uint32_t &propertyValue, uint32_t defaultValue = 0);
@@ -88,48 +88,48 @@ protected:
   int32_t   m_numUnreadMessages;
   int32_t   m_numMessages;    // includes expunged and ignored messages
 
   int32_t   m_flags;  // folder specific flags. This holds things like re-use thread pane,
   // configured for off-line use, use default retrieval, purge article/header options
 
   uint16_t    m_version;                // for upgrading...
   int16_t     m_IMAPHierarchySeparator;	// imap path separator
-  
+
   // mail only (for now)
-  
+
   // IMAP only
   int32_t     m_ImapUidValidity;
   int32_t     m_totalPendingMessages;
   int32_t     m_unreadPendingMessages;
-  
+
   // news only (for now)
   nsMsgKey    m_expiredMark;		// Highest invalid article number in group - for expiring
   // the db folder info will have to know what db and row it belongs to, since it is really
-  // just a wrapper around the singleton folder info row in the mdb. 
+  // just a wrapper around the singleton folder info row in the mdb.
   nsMsgDatabase *m_mdb;
   nsIMdbTable   *m_mdbTable;	// singleton table in db
   nsIMdbRow     *m_mdbRow;	// singleton row in table;
 
   nsCString     m_charSet;
   bool          m_charSetOverride;
   bool          m_mdbTokensInitialized;
-  
+
   mdb_token     m_rowScopeToken;
   mdb_token     m_tableKindToken;
   // tokens for the pre-set columns - we cache these for speed, which may be silly
   mdb_token     m_mailboxNameColumnToken;
   mdb_token     m_numMessagesColumnToken;
   mdb_token     m_numUnreadMessagesColumnToken;
   mdb_token     m_flagsColumnToken;
   mdb_token     m_folderSizeColumnToken;
   mdb_token     m_expungedBytesColumnToken;
   mdb_token     m_folderDateColumnToken;
   mdb_token     m_highWaterMessageKeyColumnToken;
-  
+
   mdb_token     m_imapUidValidityColumnToken;
   mdb_token     m_totalPendingMessagesColumnToken;
   mdb_token     m_unreadPendingMessagesColumnToken;
   mdb_token     m_expiredMarkColumnToken;
   mdb_token     m_versionColumnToken;
 };
 
 #endif
--- a/mailnews/db/msgdb/public/nsMailDatabase.h
+++ b/mailnews/db/msgdb/public/nsMailDatabase.h
@@ -26,17 +26,17 @@ public:
   NS_IMETHOD DeleteMessages(uint32_t aNumKeys, nsMsgKey* nsMsgKeys,
                             nsIDBChangeListener *instigator) override;
 
 
   nsresult  Open(nsMsgDBService* aDBService, nsIFile *aSummaryFile, bool create, bool upgrading) override;
   virtual nsMailDatabase  *GetMailDB() {return this;}
 
   virtual uint32_t  GetCurVersion() override {return kMsgDBVersion;}
-  
+
   NS_IMETHOD  GetOfflineOpForKey(nsMsgKey opKey, bool create,
                                  nsIMsgOfflineImapOperation **op) override;
   NS_IMETHOD  RemoveOfflineOp(nsIMsgOfflineImapOperation *op) override;
 
   NS_IMETHOD  SetSummaryValid(bool valid) override;
   NS_IMETHOD  GetSummaryValid(bool *valid) override;
 	
   NS_IMETHOD    EnumerateOfflineOps(nsISimpleEnumerator **enumerator) override;
@@ -44,22 +44,22 @@ public:
   NS_IMETHOD    ListAllOfflineDeletes(nsTArray<nsMsgKey> *offlineDeletes) override;
 
   friend class nsMsgOfflineOpEnumerator;
 protected:
 
   nsresult        GetAllOfflineOpsTable(); // get this on demand
 
   // get the time and date of the mailbox file
-  void            GetMailboxModProperties(int64_t *aSize, uint32_t *aDate); 
+  void            GetMailboxModProperties(int64_t *aSize, uint32_t *aDate);
 
   nsCOMPtr <nsIMdbTable>  m_mdbAllOfflineOpsTable;
   mdb_token       m_offlineOpsRowScopeToken;
   mdb_token       m_offlineOpsTableKindToken;
 
   virtual void    SetReparse(bool reparse);
-  
+
 protected:
-  
+
   bool            m_reparse;
 };
 
 #endif
--- a/mailnews/db/msgdb/public/nsMsgHdr.h
+++ b/mailnews/db/msgdb/public/nsMsgHdr.h
@@ -57,20 +57,20 @@ protected:
     nsresult SetUInt64Column(uint64_t value, mdb_token token);
     nsresult GetUInt64Column(mdb_token token, uint64_t *pvalue, uint64_t defaultValue = 0);
 
     // reference and threading stuff.
     nsresult	ParseReferences(const char *references);
     const char* GetNextReference(const char *startNextRef, nsCString &reference,
                                  bool acceptNonDelimitedReferences);
 
-    nsMsgKey	m_threadId; 
+    nsMsgKey	m_threadId;
     nsMsgKey	m_messageKey; 	//news: article number, mail mbox offset, imap uid...
     nsMsgKey	m_threadParent;	// message this is a reply to, in thread.
-    PRTime      m_date;                         
+    PRTime      m_date;
     uint32_t    m_messageSize;	// lines for news articles, bytes for mail messages
     uint32_t    m_statusOffset;	// offset in a local mail message of the mozilla status hdr
     uint32_t    m_flags;
     // avoid parsing references every time we want one
     nsTArray<nsCString> m_references;
     nsMsgPriorityValue  m_priority;
 
     // nsMsgHdrs will have to know what db and row they belong to, since they are really
--- a/mailnews/db/msgdb/public/nsMsgThread.h
+++ b/mailnews/db/msgdb/public/nsMsgThread.h
@@ -34,26 +34,26 @@ protected:
 
   void                  Init();
   void                  Clear();
   virtual nsresult      InitCachedValues();
   nsresult              ChangeChildCount(int32_t delta);
   nsresult              ChangeUnreadChildCount(int32_t delta);
   nsresult              RemoveChild(nsMsgKey msgKey);
   nsresult              SetThreadRootKey(nsMsgKey threadRootKey);
-  nsresult              GetChildHdrForKey(nsMsgKey desiredKey, 
-                                          nsIMsgDBHdr **result, int32_t *resultIndex); 
+  nsresult              GetChildHdrForKey(nsMsgKey desiredKey,
+                                          nsIMsgDBHdr **result, int32_t *resultIndex);
   nsresult              RerootThread(nsIMsgDBHdr *newParentOfOldRoot, nsIMsgDBHdr *oldRoot, nsIDBChangeAnnouncer *announcer);
   nsresult              ReparentChildrenOf(nsMsgKey oldParent, nsMsgKey newParent, nsIDBChangeAnnouncer *announcer);
-  
+
   nsresult              ReparentNonReferenceChildrenOf(nsIMsgDBHdr *topLevelHdr, nsMsgKey newParentKey,
                                                        nsIDBChangeAnnouncer *announcer);
   nsresult              ReparentMsgsWithInvalidParent(uint32_t numChildren, nsMsgKey threadParentKey);
 
-  nsMsgKey              m_threadKey; 
+  nsMsgKey              m_threadKey;
   uint32_t              m_numChildren;
   uint32_t              m_numUnreadChildren;
   uint32_t              m_flags;
   nsCOMPtr<nsIMdbTable> m_mdbTable;
   nsCOMPtr<nsIMdbRow>   m_metaRow;
   bool                  m_cachedValuesInitialized;
   nsMsgKey              m_threadRootKey;
   uint32_t              m_newestMsgDate;
--- a/mailnews/db/msgdb/public/nsNewsDatabase.h
+++ b/mailnews/db/msgdb/public/nsNewsDatabase.h
@@ -15,17 +15,17 @@ class MSG_RetrieveArtInfo;
 class MSG_PurgeInfo;
 // news group database
 
 class nsNewsDatabase : public nsMsgDatabase , public nsINewsDatabase
 {
 public:
   nsNewsDatabase();
 
-  NS_DECL_ISUPPORTS_INHERITED 
+  NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSINEWSDATABASE
 
   NS_IMETHOD Close(bool forceCommit) override;
   NS_IMETHOD ForceClosed() override;
   NS_IMETHOD Commit(nsMsgDBCommit commitType) override;
   virtual uint32_t GetCurVersion() override;
 
   // methods to get and set docsets for ids.
@@ -33,22 +33,22 @@ public:
   virtual nsresult  IsHeaderRead(nsIMsgDBHdr *msgHdr, bool *pRead) override;
 
   NS_IMETHOD         GetHighWaterArticleNum(nsMsgKey *key) override;
   NS_IMETHOD         GetLowWaterArticleNum(nsMsgKey *key) override;
   NS_IMETHOD         MarkAllRead(uint32_t *aNumMarked, nsMsgKey **thoseMarked) override;
 
   virtual nsresult    ExpireUpTo(nsMsgKey expireKey);
   virtual nsresult    ExpireRange(nsMsgKey startRange, nsMsgKey endRange);
- 
+
   virtual bool        SetHdrReadFlag(nsIMsgDBHdr *msgHdr, bool bRead) override;
- 
+
   virtual nsresult  AdjustExpungedBytesOnDelete(nsIMsgDBHdr *msgHdr) override;
   nsresult          SyncWithReadSet();
-  
+
   NS_IMETHOD GetDefaultViewFlags(nsMsgViewFlagsTypeValue *aDefaultViewFlags) override;
   NS_IMETHOD GetDefaultSortType(nsMsgViewSortTypeValue *aDefaultSortType) override;
   NS_IMETHOD GetDefaultSortOrder(nsMsgViewSortOrderValue *aDefaultSortOrder) override;
 
 protected:
   virtual ~nsNewsDatabase();
   // this is owned by the nsNewsFolder, which lives longer than the db.
   nsMsgKeySet           *m_readSet;
--- a/mailnews/db/msgdb/src/nsImapMailDatabase.cpp
+++ b/mailnews/db/msgdb/src/nsImapMailDatabase.cpp
@@ -48,17 +48,17 @@ NS_IMETHODIMP	nsImapMailDatabase::SetSum
 }
 
 // IMAP does not set local file flags, override does nothing
 void nsImapMailDatabase::UpdateFolderFlag(nsIMsgDBHdr * /* msgHdr */, bool /* bSet */,
                                           nsMsgMessageFlagType /* flag */, nsIOutputStream ** /* ppFileStream */)
 {
 }
 
-// We override this to avoid our parent class (nsMailDatabase)'s 
+// We override this to avoid our parent class (nsMailDatabase)'s
 // grabbing of the folder semaphore, and bailing on failure.
 NS_IMETHODIMP nsImapMailDatabase::DeleteMessages(uint32_t aNumKeys, nsMsgKey* nsMsgKeys, nsIDBChangeListener *instigator)
 {
   return nsMsgDatabase::DeleteMessages(aNumKeys, nsMsgKeys, instigator);
 }
 
 nsresult nsImapMailDatabase::AdjustExpungedBytesOnDelete(nsIMsgDBHdr *msgHdr)
 {
@@ -177,17 +177,17 @@ nsresult nsImapMailDatabase::GetRowForPe
     rv  = m_mdbStore->NewRow(GetEnv(), m_pendingHdrsRowScopeToken, getter_AddRefs(pendingRow));
 
   NS_ENSURE_SUCCESS(rv, rv);
   if (pendingRow)
   {
     // now we need to add cells to the row to remember the messageid, property and property value, and flags.
     // Then, when hdrs are added to the db, we'll check if they have a matching message-id, and if so,
     // set the property and flags
-    // XXX we already fetched messageId from the pending hdr, could it have changed by the time we get here? 
+    // XXX we already fetched messageId from the pending hdr, could it have changed by the time we get here?
     nsCString messageId;
     pendingHdr->GetMessageId(getter_Copies(messageId));
     // we're just going to ignore messages without a message-id. They should be rare. If SPAM messages often
     // didn't have message-id's, they'd be filtered on the server, most likely, and spammers would then
     // start putting in message-id's.
     if (!messageId.IsEmpty())
     {
        extern const char *kMessageIdColumnName;
--- a/mailnews/db/msgdb/src/nsMailDatabase.cpp
+++ b/mailnews/db/msgdb/src/nsMailDatabase.cpp
@@ -59,17 +59,17 @@ NS_IMETHODIMP nsMailDatabase::ForceClose
 }
 
 // get this on demand so that only db's that have offline ops will
 // create the table.
 nsresult nsMailDatabase::GetAllOfflineOpsTable()
 {
   nsresult rv = NS_OK;
   if (!m_mdbAllOfflineOpsTable)
-    rv = GetTableCreateIfMissing(kOfflineOpsScope, kOfflineOpsTableKind, getter_AddRefs(m_mdbAllOfflineOpsTable), 
+    rv = GetTableCreateIfMissing(kOfflineOpsScope, kOfflineOpsTableKind, getter_AddRefs(m_mdbAllOfflineOpsTable),
                                                 m_offlineOpsRowScopeToken, m_offlineOpsTableKindToken) ;
   return rv;
 }
 
 
 NS_IMETHODIMP nsMailDatabase::DeleteMessages(uint32_t aNumKeys, nsMsgKey* nsMsgKeys, nsIDBChangeListener *instigator)
 {
   nsresult rv;
@@ -97,17 +97,17 @@ NS_IMETHODIMP nsMailDatabase::GetSummary
   {
     *aResult = false;
     return NS_OK;
   }
   nsCOMPtr<nsIMsgPluggableStore> msgStore;
   if (!m_folder) {
     // If the folder is not set, we just return without checking the validity
     // of the summary file. For now, this is an expected condition when the
-    // message database is being opened from a URL in 
+    // message database is being opened from a URL in
     // nsMailboxUrl::GetMsgHdrForKey() which calls
     // nsMsgDBService::OpenMailDBFromFile() without a folder.
     // Returning an error here would lead to the deletion of the MSF in the
     // caller nsMsgDatabase::CheckForErrors().
     *aResult = true;
     return NS_OK;
   }
   nsresult rv = m_folder->GetMsgStore(getter_AddRefs(msgStore));
@@ -131,20 +131,20 @@ NS_IMETHODIMP nsMailDatabase::SetSummary
   nsCOMPtr<nsIMsgPluggableStore> msgStore;
   nsresult rv = m_folder->GetMsgStore(getter_AddRefs(msgStore));
   NS_ENSURE_SUCCESS(rv, rv);
   return msgStore->SetSummaryFileValid(m_folder, this, aValid);
 }
 
 NS_IMETHODIMP  nsMailDatabase::RemoveOfflineOp(nsIMsgOfflineImapOperation *op)
 {
-  
+
   nsresult rv = GetAllOfflineOpsTable();
   NS_ENSURE_SUCCESS(rv, rv);
-  
+
   if (!op || !m_mdbAllOfflineOpsTable)
     return NS_ERROR_NULL_POINTER;
   nsMsgOfflineImapOperation* offlineOp = static_cast<nsMsgOfflineImapOperation*>(op);  // closed system, so this is ok
   nsIMdbRow* row = offlineOp->GetMDBRow();
   rv = m_mdbAllOfflineOpsTable->CutRow(GetEnv(), row);
   row->CutAllColumns(GetEnv());
   return rv;
 }
@@ -152,41 +152,41 @@ NS_IMETHODIMP  nsMailDatabase::RemoveOff
 NS_IMETHODIMP nsMailDatabase::GetOfflineOpForKey(nsMsgKey msgKey, bool create, nsIMsgOfflineImapOperation **offlineOp)
 {
   mdb_bool	hasOid;
   mdbOid		rowObjectId;
   nsresult err;
 
   nsresult rv = GetAllOfflineOpsTable();
   NS_ENSURE_SUCCESS(rv, rv);
-  
+
   if (!offlineOp || !m_mdbAllOfflineOpsTable)
     return NS_ERROR_NULL_POINTER;
-  
+
   *offlineOp = NULL;
-  
+
   rowObjectId.mOid_Id = msgKey;
   rowObjectId.mOid_Scope = m_offlineOpsRowScopeToken;
   err = m_mdbAllOfflineOpsTable->HasOid(GetEnv(), &rowObjectId, &hasOid);
   if (NS_SUCCEEDED(err) && m_mdbStore && (hasOid  || create))
   {
     nsCOMPtr <nsIMdbRow> offlineOpRow;
     err = m_mdbStore->GetRow(GetEnv(), &rowObjectId, getter_AddRefs(offlineOpRow));
-    
+
     if (create)
     {
       if (!offlineOpRow)
       {
         err  = m_mdbStore->NewRowWithOid(GetEnv(), &rowObjectId, getter_AddRefs(offlineOpRow));
         NS_ENSURE_SUCCESS(err, err);
       }
       if (offlineOpRow && !hasOid)
         m_mdbAllOfflineOpsTable->AddRow(GetEnv(), offlineOpRow);
     }
-    
+
     if (NS_SUCCEEDED(err) && offlineOpRow)
     {
       NS_IF_ADDREF(*offlineOp = new nsMsgOfflineImapOperation(this, offlineOpRow));
       (*offlineOp)->SetMessageKey(msgKey);
     }
     if (!hasOid && m_dbFolderInfo)
     {
       // set initial value for flags so we don't lose them.
@@ -197,17 +197,17 @@ NS_IMETHODIMP nsMailDatabase::GetOffline
         uint32_t flags;
         msgHdr->GetFlags(&flags);
         (*offlineOp)->SetNewFlags(flags);
       }
       int32_t newFlags;
       m_dbFolderInfo->OrFlags(nsMsgFolderFlags::OfflineEvents, &newFlags);
     }
   }
-  
+
   return err;
 }
 
 NS_IMETHODIMP nsMailDatabase::EnumerateOfflineOps(nsISimpleEnumerator **enumerator)
 {
   NS_ASSERTION(false, "not impl yet");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -222,17 +222,17 @@ NS_IMETHODIMP nsMailDatabase::ListAllOff
 
   if (m_mdbAllOfflineOpsTable)
   {
     nsresult err = m_mdbAllOfflineOpsTable->GetTableRowCursor(GetEnv(), -1, &rowCursor);
     while (NS_SUCCEEDED(err) && rowCursor)
     {
       mdbOid outOid;
       mdb_pos	outPos;
-      
+
       err = rowCursor->NextRowOid(GetEnv(), &outOid, &outPos);
       // is this right? Mork is returning a 0 id, but that should valid.
       if (outPos < 0 || outOid.mOid_Id == (mdb_id) -1)
         break;
       if (NS_SUCCEEDED(err))
       {
         offlineOpIds->AppendElement(outOid.mOid_Id);
         if (MOZ_LOG_TEST(IMAPOffline, LogLevel::Info))
@@ -360,17 +360,17 @@ NS_IMETHODIMP nsMsgOfflineOpEnumerator::
 {
   NS_ENSURE_ARG_POINTER(aItem);
 
   nsresult rv = NS_OK;
   if (!mNextPrefetched)
     rv = PrefetchNext();
   if (NS_SUCCEEDED(rv))
   {
-    if (mResultOp) 
+    if (mResultOp)
     {
       NS_ADDREF(*aItem = mResultOp);
       mNextPrefetched = false;
     }
   }
   return rv;
 }
 
@@ -383,33 +383,33 @@ nsresult nsMsgOfflineOpEnumerator::Prefe
   if (!mRowCursor)
   {
     rv = GetRowCursor();
     if (NS_FAILED(rv))
       return rv;
   }
 
   rv = mRowCursor->NextRow(mDB->GetEnv(), &offlineOpRow, &rowPos);
-  if (!offlineOpRow) 
+  if (!offlineOpRow)
   {
     mDone = true;
     return NS_ERROR_FAILURE;
   }
-  if (NS_FAILED(rv)) 
+  if (NS_FAILED(rv))
   {
     mDone = true;
     return rv;
   }
 
   nsIMsgOfflineImapOperation *op = new nsMsgOfflineImapOperation(mDB, offlineOpRow);
   mResultOp = op;
   if (!op)
     return NS_ERROR_OUT_OF_MEMORY;
 
-  if (mResultOp) 
+  if (mResultOp)
   {
     mNextPrefetched = true;
     return NS_OK;
   }
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP nsMsgOfflineOpEnumerator::HasMoreElements(bool *aResult)
--- a/mailnews/db/msgdb/src/nsMsgDatabase.cpp
+++ b/mailnews/db/msgdb/src/nsMsgDatabase.cpp
@@ -267,17 +267,17 @@ NS_IMETHODIMP nsMsgDBService::OpenMore(n
     }
   }
   while (PR_IntervalToMilliseconds(PR_IntervalNow() - startTime) <= aTimeHint);
   *_retval = !msgDatabase->m_thumb;
   return rv;
 }
 
 /**
- * When a db is opened, we need to hook up any pending listeners for 
+ * When a db is opened, we need to hook up any pending listeners for
  * that db, and notify them.
  */
 void nsMsgDBService::HookupPendingListeners(nsIMsgDatabase *db,
                                             nsIMsgFolder *folder)
 {
   for (int32_t listenerIndex = 0;
        listenerIndex < m_foldersPendingListeners.Count(); listenerIndex++)
   {
@@ -363,30 +363,30 @@ NS_IMETHODIMP nsMsgDBService::OpenMailDB
     msgDB->m_folder = aFolder;
   return rv;
 }
 
 NS_IMETHODIMP nsMsgDBService::CreateNewDB(nsIMsgFolder *aFolder,
                                           nsIMsgDatabase **_retval)
 {
   NS_ENSURE_ARG(aFolder);
-  
+
   nsCOMPtr <nsIMsgIncomingServer> incomingServer;
   nsresult rv = aFolder->GetServer(getter_AddRefs(incomingServer));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIFile> summaryFilePath;
   rv = aFolder->GetSummaryFile(getter_AddRefs(summaryFilePath));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCString localDatabaseType;
   incomingServer->GetLocalDatabaseType(localDatabaseType);
   nsAutoCString dbContractID(NS_MSGDB_CONTRACTID);
   dbContractID.Append(localDatabaseType.get());
-  
+
   nsCOMPtr <nsIMsgDatabase> msgDB = do_CreateInstance(dbContractID.get(), &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsMsgDatabase *msgDatabase = static_cast<nsMsgDatabase *>(msgDB.get());
 
   msgDatabase->m_folder = aFolder;
   rv = msgDatabase->Open(this, summaryFilePath, true, true);
 
@@ -875,17 +875,17 @@ public:
                             nsISupports* aClosure,
                             bool aAnonymize) override
   {
     nsCString path;
     GetPath(path, aAnonymize);
     return aCb->Callback(EmptyCString(), path,
                          nsIMemoryReporter::KIND_HEAP,
                          nsIMemoryReporter::UNITS_BYTES,
-                         mDatabase->SizeOfIncludingThis(GetMallocSize),           
+                         mDatabase->SizeOfIncludingThis(GetMallocSize),
                          NS_LITERAL_CSTRING("Memory used for the folder database."),
                          aClosure);
   }
 
   void GetPath(nsACString &memoryPath, bool aAnonymize)
   {
     memoryPath.AssignLiteral("explicit/maildb/database(");
     nsCOMPtr<nsIMsgFolder> folder;
@@ -1169,17 +1169,17 @@ nsresult nsMsgDatabase::OpenMDB(const ch
         if (NS_SUCCEEDED(ret))
           ret = dbFile->Exists(&exists);
       }
       if (!exists)
       {
         ret = NS_MSG_ERROR_FOLDER_SUMMARY_MISSING;
       }
       // If m_thumb is set, we're asynchronously opening the db already.
-      else if (!m_thumb) 
+      else if (!m_thumb)
       {
         mdbOpenPolicy inOpenPolicy;
         mdb_bool  canOpen;
         mdbYarn    outFormatVersion;
 
         nsIMdbFile* oldFile = nullptr;
         ret = mdbFactory->OpenOldFile(m_mdbEnv, dbHeap, dbName,
                                       mdbBool_kFalse, // not readonly, we want modifiable
@@ -1823,17 +1823,17 @@ NS_IMETHODIMP nsMsgDatabase::DeleteHeade
   {
     (void)msg->GetFlags(&flags);
     msg->GetThreadParent(&threadParent);
   }
 
   RemoveHeaderFromThread(msgHdr);
   if (notify)
   {
-    // If deleted hdr was new, restore the new flag on flags 
+    // If deleted hdr was new, restore the new flag on flags
     // so saved searches will know to reduce their new msg count.
     if (hdrWasNew)
       flags |= nsMsgMessageFlags::New;
     NotifyHdrDeletedAll(msg, threadParent, flags, instigator); // tell listeners
   }
   //  if (!onlyRemoveFromThread)  // to speed up expiration, try this. But really need to do this in RemoveHeaderFromDB
   nsresult ret = RemoveHeaderFromDB(msgHdr);
 
@@ -2273,17 +2273,17 @@ nsMsgDatabase::SetUint32PropertyByHdr(ns
   // If no change to this property, bail out.
   uint32_t oldValue;
   nsresult rv = aMsgHdr->GetUint32Property(aProperty, &oldValue);
   NS_ENSURE_SUCCESS(rv, rv);
   if (oldValue == aValue)
     return NS_OK;
 
   // Don't do notifications if message not yet added to database.
-  bool notify = true;  
+  bool notify = true;
   nsMsgKey key = nsMsgKey_None;
   aMsgHdr->GetMessageKey(&key);
   ContainsKey(key, &notify);
 
   // Precall OnHdrPropertyChanged to store prechange status.
   nsTArray<uint32_t> statusArray(m_ChangeListeners.Length());
   uint32_t status;
   nsCOMPtr<nsIDBChangeListener> listener;
@@ -2466,17 +2466,17 @@ NS_IMETHODIMP nsMsgDatabase::MarkHdrRead
   // if the flag is already correct in the db, don't change it.
   // Check msg flags as well as IsHeaderRead in case it's a newsgroup
   // and the msghdr flags are out of sync with the newsrc settings.
   // (we could override this method for news db's, but it's a trivial fix here.
   if (bRead != isRead || isRead != isReadInDB)
   {
     nsMsgKey msgKey;
     msgHdr->GetMessageKey(&msgKey);
-    
+
     bool inDB = false;
     (void)ContainsKey(msgKey, &inDB);
 
     if (inDB)
     {
       nsCOMPtr <nsIMsgThread> threadHdr;
       rv = GetThreadForMsgKey(msgKey, getter_AddRefs(threadHdr));
       if (threadHdr)
@@ -2853,17 +2853,17 @@ nsMsgDatabase::ReverseEnumerateMessages(
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsMsgDatabase::GetFilterEnumerator(nsIArray *searchTerms, bool aReverse,
                                    nsISimpleEnumerator **aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
-  RefPtr<nsMsgFilteredDBEnumerator> e = 
+  RefPtr<nsMsgFilteredDBEnumerator> e =
     new nsMsgFilteredDBEnumerator(this, m_mdbAllMsgHeadersTable, aReverse,
                                   searchTerms);
 
   NS_ENSURE_TRUE(e, NS_ERROR_OUT_OF_MEMORY);
   nsresult rv = e->InitSearchSession(searchTerms, m_folder);
   NS_ENSURE_SUCCESS(rv, rv);
   return CallQueryInterface(e.get(), aResult);
 }
@@ -3042,20 +3042,20 @@ NS_IMPL_ISUPPORTS(nsMsgDBThreadEnumerato
 
 
 /* void OnHdrFlagsChanged (in nsIMsgDBHdr aHdrChanged, in unsigned long aOldFlags, in unsigned long aNewFlags, in nsIDBChangeListener aInstigator); */
 NS_IMETHODIMP nsMsgDBThreadEnumerator::OnHdrFlagsChanged(nsIMsgDBHdr *aHdrChanged, uint32_t aOldFlags, uint32_t aNewFlags, nsIDBChangeListener *aInstigator)
 {
     return NS_OK;
 }
 
-//void OnHdrPropertyChanged(in nsIMsgDBHdr aHdrToChange, in bool aPreChange, 
+//void OnHdrPropertyChanged(in nsIMsgDBHdr aHdrToChange, in bool aPreChange,
 // inout uint32_t aStatus, in nsIDBChangeListener aInstigator);
 NS_IMETHODIMP
-nsMsgDBThreadEnumerator::OnHdrPropertyChanged(nsIMsgDBHdr *aHdrToChange, bool aPreChange, uint32_t *aStatus, 
+nsMsgDBThreadEnumerator::OnHdrPropertyChanged(nsIMsgDBHdr *aHdrToChange, bool aPreChange, uint32_t *aStatus,
                                          nsIDBChangeListener * aInstigator)
 {
   return NS_OK;
 }
 
 /* void onHdrDeleted (in nsIMsgDBHdr aHdrChanged, in nsMsgKey aParentKey, in long aFlags, in nsIDBChangeListener aInstigator); */
 NS_IMETHODIMP nsMsgDBThreadEnumerator::OnHdrDeleted(nsIMsgDBHdr *aHdrChanged, nsMsgKey aParentKey, int32_t aFlags, nsIDBChangeListener *aInstigator)
 {
@@ -3843,27 +3843,27 @@ nsresult nsMsgDatabase::SetUint64Propert
   if (NS_SUCCEEDED(err))
   {
     UInt64ToYarn(&yarn, propertyVal);
     err = row->AddColumn(GetEnv(), property_token, &yarn);
   }
   return err;
 }
 
-nsresult nsMsgDatabase::GetBooleanProperty(nsIMdbRow *row, const char *propertyName, 
-                                     bool *result, 
+nsresult nsMsgDatabase::GetBooleanProperty(nsIMdbRow *row, const char *propertyName,
+                                     bool *result,
                                      bool defaultValue /* = false */)
 {
   uint32_t res;
   nsresult rv = GetUint32Property(row, propertyName, &res, (uint32_t) defaultValue);
   *result = !!res;
   return rv;
 }
 
-nsresult nsMsgDatabase::SetBooleanProperty(nsIMdbRow *row, const char *propertyName, 
+nsresult nsMsgDatabase::SetBooleanProperty(nsIMdbRow *row, const char *propertyName,
                                     bool propertyVal)
 {
   return SetUint32Property(row, propertyName, (uint32_t) propertyVal);
 }
 
 nsresult nsMsgDatabase::SetNSStringPropertyWithToken(nsIMdbRow *row, mdb_token aProperty, const nsAString &propertyStr)
 {
   NS_ENSURE_ARG(row);
@@ -3950,17 +3950,17 @@ void nsMsgDatabase::AddMsgRefsToHash(nsI
   nsMsgKey threadId;
 
   msgHdr->GetThreadId(&threadId);
   msgHdr->GetNumReferences(&numReferences);
 
   for (int32_t i = 0; i < numReferences; i++)
   {
     nsAutoCString reference;
-    
+
     msgHdr->GetStringReference(i, reference);
     if (reference.IsEmpty())
       break;
 
     AddRefToHash(reference, threadId);
   }
 }
 
@@ -3974,17 +3974,17 @@ void nsMsgDatabase::RemoveMsgRefsFromHas
 {
   uint16_t numReferences = 0;
 
   msgHdr->GetNumReferences(&numReferences);
 
   for (int32_t i = 0; i < numReferences; i++)
   {
     nsAutoCString reference;
-    
+
     msgHdr->GetStringReference(i, reference);
     if (reference.IsEmpty())
       break;
 
     RemoveRefFromHash(reference);
   }
 }
 
@@ -4187,17 +4187,17 @@ nsIMsgThread *  nsMsgDatabase::GetThread
   return thread;
 }
 
 // Returns thread that contains a message that references the passed message ID
 nsIMsgThread *nsMsgDatabase::GetThreadForMessageId(nsCString &msgId)
 {
   nsIMsgThread *thread = NULL;
   nsMsgKey threadId;
-  
+
   if (NS_SUCCEEDED(GetRefFromHash(msgId, &threadId)))
     thread = GetThreadForThreadId(threadId);
 
   return thread;
 }
 
 nsresult nsMsgDatabase::ThreadNewHdr(nsMsgHdr* newHdr, bool &newThread)
 {
--- a/mailnews/db/msgdb/src/nsMsgHdr.cpp
+++ b/mailnews/db/msgdb/src/nsMsgHdr.cpp
@@ -692,46 +692,46 @@ nsresult nsMsgHdr::GetUInt64Column(mdb_t
 /**
  * Roughly speaking, get the next message-id (starts with a '<' ends with a
  *  '>').  Except, we also try to handle the case where your reference is of
  *  a prehistoric vintage that just stuck any old random junk in there.  Our
  *  old logic would (unintentionally?) just trim the whitespace off the front
  *  and hand you everything after that.  We change things at all because that
  *  same behaviour does not make sense if we have already seen a proper message
  *  id.  We keep the old behaviour at all because it would seem to have
- *  benefits.  (See jwz's non-zero stats: http://www.jwz.org/doc/threading.html) 
+ *  benefits.  (See jwz's non-zero stats: http://www.jwz.org/doc/threading.html)
  * So, to re-state, if there is a valid message-id in there at all, we only
  *  return valid message-id's (sans bracketing '<' and '>').  If there isn't,
  *  our result (via "references") is a left-trimmed copy of the string.  If
  *  there is nothing in there, our result is an empty string.)  We do require
  *  that you pass allowNonDelimitedReferences what it demands, though.
  * For example: "<valid@stuff> this stuff is invalid" would net you
  *  "valid@stuff" and "this stuff is invalid" as results.  We now only would
  *  provide "valid-stuff" and an empty string (which you should ignore) as
  *  results.  However "this stuff is invalid" would return itself, allowing
  *  anything relying on that behaviour to keep working.
- * 
+ *
  * Note: We accept anything inside the '<' and '>'; technically, we should want
  *  at least a '@' in there (per rfc 2822).  But since we're going out of our
  *  way to support weird things...
- * 
+ *
  * @param startNextRef The position to start at; this should either be the start
  *     of your references string or our return value from a previous call.
  * @param reference You pass a nsCString by reference, we put the reference we
  *     find in it, if we find one.  It may be empty!  Beware!
  * @param allowNonDelimitedReferences Should we support the
  *     pre-reasonable-standards form of In-Reply-To where it could be any
  *     arbitrary string and our behaviour was just to take off leading
  *     whitespace.  It only makes sense to pass true for your first call to this
  *     function, as if you are around to make a second call, it means we found
  *     a properly formatted message-id and so we should only look for more
  *     properly formatted message-ids.
  * @returns The next starting position of this routine, which may be pointing at
  *     a nul '\0' character to indicate termination.
- */ 
+ */
 const char *nsMsgHdr::GetNextReference(const char *startNextRef,
                                        nsCString &reference,
                                        bool acceptNonDelimitedReferences)
 {
   const char *ptr = startNextRef;
   const char *whitespaceEndedAt = nullptr;
   const char *firstMessageIdChar = nullptr;
 
@@ -767,17 +767,17 @@ const char *nsMsgHdr::GetNextReference(c
         MOZ_FALLTHROUGH;
       default:
         if (!whitespaceEndedAt)
             whitespaceEndedAt = ptr;
         break;
     }
   }
 
-  // keep going until we hit a '>' or hit the end of the string 
+  // keep going until we hit a '>' or hit the end of the string
   for(; *ptr ; ptr++)
   {
     if (*ptr == '>')
     {
       // it's valid, update reference, making sure to stop before the '>'
       reference.Assign(firstMessageIdChar, ptr - firstMessageIdChar);
       // and return a start point just after the '>'
       return ++ptr;