fix unix warnings

mailnews/local/src/nsParseMailbox.cpp

@@ -1335,12 +1335,10 @@ int nsParseMailMessageState::FinalizeHeaders()
 
 nsParseNewMailState::nsParseNewMailState()
     : m_tmpdbName(nsnull), m_usingTempDB(PR_FALSE), m_disableFilters(PR_FALSE)
-#ifdef DOING_FILTERS
-    , m_logFile(nsnull)
-#endif
 {
 #ifdef DOING_FILTERS
 	m_inboxFileStream = nsnull;
+	m_logFile = nsnull;
 #endif
 }
 
@@ -1519,7 +1517,8 @@ PRInt32 nsParseNewMailState::PublishMsgHeader()
 	{
 		FolderTypeSpecificTweakMsgHeader(m_newMsgHdr);
 #ifdef DOING_FILTERS
-		if (!m_disableFilters) {
+		if (!m_disableFilters)
+		{
 			ApplyFilters(&moved);
 		}
 #endif // DOING_FILTERS
@@ -1587,8 +1586,6 @@ nsresult nsParseNewMailState::GetTrashFolder(nsIMsgFolder **pTrashFolder)
 
 void nsParseNewMailState::ApplyFilters(PRBool *pMoved)
 {
-	PRBool		msgMoved = FALSE;
-
 	m_msgMovedByFilter = PR_FALSE;
 
 	nsIMsgDBHdr	*msgHdr = m_newMsgHdr;
@@ -1642,7 +1639,7 @@ NS_IMETHODIMP nsParseNewMailState::ApplyFilterHit(nsIMsgFilter *filter, PRBool *
 		{
 			nsCOMPtr <nsIMsgFolder> trash;
 			// set value to trash folder
-			nsresult rv = GetTrashFolder(getter_AddRefs(trash));
+			rv = GetTrashFolder(getter_AddRefs(trash));
 			if (NS_SUCCEEDED(rv) && trash)
 			{
 				// this sucks - but we need value to live past this scope
@@ -1661,7 +1658,6 @@ NS_IMETHODIMP nsParseNewMailState::ApplyFilterHit(nsIMsgFilter *filter, PRBool *
 			// if moving to a different file, do it.
 			if (value && PL_strcasecmp(m_mailboxName, (char *) value))
 			{
-				PRUint32 msgFlags;
 				msgHdr->GetFlags(&msgFlags);
 
 				if (msgFlags & MSG_FLAG_MDN_REPORT_NEEDED &&
@@ -1840,7 +1836,7 @@ nsresult nsParseNewMailState::MoveIncorporatedMessage(nsIMsgDBHdr *mailHdr,
 			break;
 		
 		// we must monitor the number of bytes actually written to the file. (mscott)
-		if (destFile->write(m_ibuffer, nRead) != nRead) 
+		if (destFile->write(m_ibuffer, nRead) != (PRInt32) nRead) 
 		{
 			destFile->close();     
 

mailnews/local/src/nsParseMailbox.h

@@ -32,7 +32,7 @@
 
 
 #ifdef DEBUG_bienvenu
-#define DOING_FILTERS
+//#define DOING_FILTERS
 #endif
 
 #ifdef DOING_FILTERS
@@ -272,6 +272,8 @@ public:
 #endif // DOING_FILTERS
 protected:
 	virtual PRInt32	PublishMsgHeader();
+	char				*m_tmpdbName;				// Temporary filename of new database
+	PRBool				m_usingTempDB;
 #ifdef DOING_FILTERS
 	virtual void	ApplyFilters(PRBool *pMoved);
 	virtual nsresult GetTrashFolder(nsIMsgFolder **pTrashFolder);
@@ -287,8 +289,6 @@ protected:
 	nsIOFileStream		*m_inboxFileStream;
 	nsFileSpec			m_inboxFileSpec;
 #endif // DOING_FILTERS
-	char				*m_tmpdbName;				// Temporary filename of new database
-	PRBool				m_usingTempDB;
 	PRBool				m_disableFilters;
 	PRBool				m_msgMovedByFilter;
 };