no brainer code cleanup. not part of any bug. rs=bienvenu

git-svn-id: svn://10.0.0.236/trunk@135222 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/mailnews/base/public/nsIMsgFolder.idl

@@ -297,7 +297,7 @@ const nsMsgBiffState nsMsgBiffState_Unknown = 2; // We dunno whether there is ne
 
   string getUriForMsg(in nsIMsgDBHdr msgHdr);
 
-	void deleteMessages(in nsISupportsArray message,
+	void deleteMessages(in nsISupportsArray messages,
                       in nsIMsgWindow msgWindow,
                       in boolean deleteStorage, in boolean isMove,
                       in nsIMsgCopyServiceListener listener, in boolean allowUndo);

mozilla/mailnews/base/resources/content/messageWindow.js

@@ -189,7 +189,6 @@ const nsMsgKey_None = 0xFFFFFFFF;
 
 function HandleDeleteOrMoveMsgCompleted(folder)
 {
-	dump("In HandleDeleteOrMoveMsgCompleted\n");
 	var folderResource = folder.QueryInterface(Components.interfaces.nsIRDFResource);
 	if (!folderResource)
 		return;

mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp

@@ -271,10 +271,8 @@ NS_IMETHODIMP nsMailDatabase::EndBatch()
   return NS_OK;
 }
 
-
 NS_IMETHODIMP nsMailDatabase::DeleteMessages(nsMsgKeyArray* nsMsgKeys, nsIDBChangeListener *instigator)
 {
-	nsresult ret = NS_OK;
   if (!m_folderStream && m_folder)
   {
     PRBool isLocked;
@@ -284,29 +282,31 @@ NS_IMETHODIMP nsMailDatabase::DeleteMessages(nsMsgKeyArray* nsMsgKeys, nsIDBChan
       NS_ASSERTION(PR_FALSE, "Some other operation is in progress");
       return NS_MSG_FOLDER_BUSY;
     }
-	  m_folderStream = new nsIOFileStream(nsFileSpec(*m_folderSpec));
+    m_folderStream = new nsIOFileStream(nsFileSpec(*m_folderSpec));
     m_ownFolderStream = PR_TRUE;
   }
-	ret = nsMsgDatabase::DeleteMessages(nsMsgKeys, instigator);
+
+  nsresult rv = nsMsgDatabase::DeleteMessages(nsMsgKeys, instigator);
   if (m_ownFolderStream)//only if we own the stream, then we should close it
   {
-	  if (m_folderStream)
+    if (m_folderStream)
     {
       m_folderStream->close();
-	    delete m_folderStream;
+      delete m_folderStream;
     }
-	  m_folderStream = nsnull;
+    m_folderStream = nsnull;
     m_ownFolderStream = PR_FALSE;
   }
-	SetFolderInfoValid(m_folderSpec, 0, 0);
-	return ret;
+
+  SetFolderInfoValid(m_folderSpec, 0, 0);
+  return rv;
 }
 
 // Helper routine - lowest level of flag setting
 PRBool nsMailDatabase::SetHdrFlag(nsIMsgDBHdr *msgHdr, PRBool bSet, MsgFlags flag)
 {
-  nsIOFileStream *fileStream = NULL;
-  PRBool		ret = PR_FALSE;
+  nsIOFileStream *fileStream = nsnull;
+  PRBool ret = PR_FALSE;
 
   if (!m_folderStream && m_folder)  //we are going to create a stream, bail out if someone else has lock
   {

mozilla/mailnews/imap/src/nsImapMailFolder.cpp

@@ -1921,7 +1921,6 @@ NS_IMETHODIMP nsImapMailFolder::DeleteMessages(nsISupportsArray *messages,
                                                nsIMsgCopyServiceListener* listener,
                                                PRBool allowUndo)
 {
-  nsresult rv = NS_ERROR_FAILURE;
   // *** jt - assuming delete is move to the trash folder for now
   nsCOMPtr<nsIEnumerator> aEnumerator;
   nsCOMPtr<nsIRDFResource> res;
@@ -1933,7 +1932,7 @@ NS_IMETHODIMP nsImapMailFolder::DeleteMessages(nsISupportsArray *messages,
   nsMsgImapDeleteModel deleteModel = nsMsgImapDeleteModels::MoveToTrash;
   
   nsCOMPtr<nsIImapIncomingServer> imapServer;
-  rv = GetFlag(MSG_FOLDER_FLAG_TRASH, &deleteImmediatelyNoTrash);
+  nsresult rv = GetFlag(MSG_FOLDER_FLAG_TRASH, &deleteImmediatelyNoTrash);
   rv = GetImapIncomingServer(getter_AddRefs(imapServer));
   
   if (NS_SUCCEEDED(rv) && imapServer)

mozilla/mailnews/local/src/nsLocalMailFolder.cpp

@@ -1570,11 +1570,12 @@ nsMsgLocalMailFolder::DeleteMessages(nsISupportsArray *messages,
                                      PRBool deleteStorage, PRBool isMove,
                                      nsIMsgCopyServiceListener* listener, PRBool allowUndo)
 {
-  nsresult rv = NS_ERROR_FAILURE;
-  if (!messages) return rv;
+  NS_ENSURE_ARG_POINTER(messages);
+
   PRUint32 messageCount;
-  rv = messages->Count(&messageCount);
-  if (messageCount == 0) return rv;
+  nsresult rv = messages->Count(&messageCount);
+  if (!messageCount)
+    return rv;
 
   PRBool isTrashFolder = mFlags & MSG_FOLDER_FLAG_TRASH;
   if (!deleteStorage && !isTrashFolder)

mozilla/mailnews/news/src/nsNewsFolder.cpp

@@ -1608,17 +1608,19 @@ nsMsgNewsFolder::GetNntpServer(nsINntpIncomingServer **result)
 
     nsCOMPtr<nsIMsgIncomingServer> server;
     rv = GetServer(getter_AddRefs(server));
-    if (NS_FAILED(rv)) return rv;
-    if (!server) return NS_ERROR_NULL_POINTER;
+    if (NS_FAILED(rv)) 
+      return rv;
+
+    if (!server) 
+      return NS_ERROR_NULL_POINTER;
 
     nsCOMPtr<nsINntpIncomingServer> nntpServer;
     rv = server->QueryInterface(NS_GET_IID(nsINntpIncomingServer),
                                 getter_AddRefs(nntpServer));
-    if (NS_FAILED(rv)) return rv;
-
-    *result = nntpServer;
-    NS_IF_ADDREF(*result);
+    if (NS_FAILED(rv)) 
+      return rv;
 
+    NS_IF_ADDREF(*result = nntpServer);
     return NS_OK;
 }