From c1bd5bfbacb02c26d1f049fe418d5ebe7ac75058 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Fri, 13 Dec 2002 03:43:30 +0000 Subject: [PATCH] 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 | 2 +- .../base/resources/content/messageWindow.js | 1 - .../mailnews/db/msgdb/src/nsMailDatabase.cpp | 22 +++++++++---------- .../mailnews/imap/src/nsImapMailFolder.cpp | 3 +-- .../mailnews/local/src/nsLocalMailFolder.cpp | 9 ++++---- mozilla/mailnews/news/src/nsNewsFolder.cpp | 14 +++++++----- 6 files changed, 26 insertions(+), 25 deletions(-) diff --git a/mozilla/mailnews/base/public/nsIMsgFolder.idl b/mozilla/mailnews/base/public/nsIMsgFolder.idl index 6288b521c89..6249cda82e3 100644 --- a/mozilla/mailnews/base/public/nsIMsgFolder.idl +++ b/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); diff --git a/mozilla/mailnews/base/resources/content/messageWindow.js b/mozilla/mailnews/base/resources/content/messageWindow.js index d1123af64f7..1e538419a47 100644 --- a/mozilla/mailnews/base/resources/content/messageWindow.js +++ b/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; diff --git a/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp index ff5935446e2..559de1fd80f 100644 --- a/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp +++ b/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 { diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp index 41e0e7d202f..215978dd2c2 100644 --- a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp +++ b/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 aEnumerator; nsCOMPtr res; @@ -1933,7 +1932,7 @@ NS_IMETHODIMP nsImapMailFolder::DeleteMessages(nsISupportsArray *messages, nsMsgImapDeleteModel deleteModel = nsMsgImapDeleteModels::MoveToTrash; nsCOMPtr 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) diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp index a5223e6e4df..1620cda855e 100644 --- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp +++ b/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) diff --git a/mozilla/mailnews/news/src/nsNewsFolder.cpp b/mozilla/mailnews/news/src/nsNewsFolder.cpp index b9cb1316363..17f0e636a29 100644 --- a/mozilla/mailnews/news/src/nsNewsFolder.cpp +++ b/mozilla/mailnews/news/src/nsNewsFolder.cpp @@ -1608,17 +1608,19 @@ nsMsgNewsFolder::GetNntpServer(nsINntpIncomingServer **result) nsCOMPtr 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 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; }