Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 03:24:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove carriage returns introduced by previous checkin. Fixes IRIX bustage.

Browse Source
This commit is contained in:
dbaron%fas.harvard.edu 2001-07-13 06:16:18 +00:00
parent 2822c6166e
commit ad6bdfd2c5
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mailnews/base/src/nsMsgDBView.cpp
View File

@ -3154,13 +3154,13 @@ PRInt32 nsMsgDBView::FindLevelInThread(nsIMsgDBHdr *msgHdr, nsMsgViewIndex start
} }
nsresult nsMsgDBView::ListIdsInThreadOrder(nsIMsgThread *threadHdr, nsMsgKey parentKey, PRInt32 level, nsMsgViewIndex *viewIndex, PRUint32 *pNumListed) nsresult nsMsgDBView::ListIdsInThreadOrder(nsIMsgThread *threadHdr, nsMsgKey parentKey, PRInt32 level, nsMsgViewIndex *viewIndex, PRUint32 *pNumListed)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
nsCOMPtr <nsISimpleEnumerator> msgEnumerator; nsCOMPtr <nsISimpleEnumerator> msgEnumerator;
threadHdr->EnumerateMessages(parentKey, getter_AddRefs(msgEnumerator)); threadHdr->EnumerateMessages(parentKey, getter_AddRefs(msgEnumerator));
PRUint32 numChildren; PRUint32 numChildren;
(void) threadHdr->GetNumChildren(&numChildren); (void) threadHdr->GetNumChildren(&numChildren);
// skip the first one. // skip the first one.
PRBool hasMore; PRBool hasMore;
nsCOMPtr <nsISupports> supports; nsCOMPtr <nsISupports> supports;
@ -3187,17 +3187,17 @@ nsresult nsMsgDBView::ListIdsInThreadOrder(nsIMsgThread *threadHdr, nsMsgKey par
// turn off thread or elided bit if they got turned on (maybe from new only view?) // turn off thread or elided bit if they got turned on (maybe from new only view?)
msgHdr->AndFlags(~(MSG_VIEW_FLAG_ISTHREAD | MSG_FLAG_ELIDED), &newFlags); msgHdr->AndFlags(~(MSG_VIEW_FLAG_ISTHREAD | MSG_FLAG_ELIDED), &newFlags);
(*pNumListed)++; (*pNumListed)++;
(*viewIndex)++; (*viewIndex)++;
if (*pNumListed > numChildren) if (*pNumListed > numChildren)
{ {
NS_ASSERTION(PR_FALSE, "thread corrupt in db"); NS_ASSERTION(PR_FALSE, "thread corrupt in db");
// if we've listed more messages than are in the thread, then the db // if we've listed more messages than are in the thread, then the db
// is corrupt, and we should invalidate it. // is corrupt, and we should invalidate it.
// we'll use this rv to indicate there's something wrong with the db // we'll use this rv to indicate there's something wrong with the db
// though for now it probably won't get paid attention to. // though for now it probably won't get paid attention to.
m_db->SetSummaryValid(PR_FALSE); m_db->SetSummaryValid(PR_FALSE);
rv = NS_MSG_ERROR_FOLDER_SUMMARY_OUT_OF_DATE; rv = NS_MSG_ERROR_FOLDER_SUMMARY_OUT_OF_DATE;
break; break;
} }
rv = ListIdsInThreadOrder(threadHdr, msgKey, level + 1, viewIndex, pNumListed); rv = ListIdsInThreadOrder(threadHdr, msgKey, level + 1, viewIndex, pNumListed);
} }