Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build warnings, no bug, r/sr=sspitzer

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@128179 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bienvenu%netscape.com 2002-08-26 22:58:50 +00:00
parent 787dfefba0
commit a489131c3e
3 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp
View File

@ -531,16 +531,16 @@ nsresult nsMailDatabase::GetFolderName(nsString &folderName)
NS_IMETHODIMP nsMailDatabase::RemoveOfflineOp(nsIMsgOfflineImapOperation *op)
{
nsresult rv = GetAllOfflineOpsTable();
NS_ENSURE_SUCCESS(rv, rv);
if (!op || !m_mdbAllOfflineOpsTable)
return NS_ERROR_NULL_POINTER;
if (!op || !m_mdbAllOfflineOpsTable)
return NS_ERROR_NULL_POINTER;
nsMsgOfflineImapOperation* offlineOp = NS_STATIC_CAST(nsMsgOfflineImapOperation*, op); // closed system, so this is ok
nsIMdbRow* row = offlineOp->GetMDBRow();
nsresult ret = m_mdbAllOfflineOpsTable->CutRow(GetEnv(), row);
row->CutAllColumns(GetEnv());
nsIMdbRow* row = offlineOp->GetMDBRow();
rv = m_mdbAllOfflineOpsTable->CutRow(GetEnv(), row);
row->CutAllColumns(GetEnv());
return rv;
}
@ -651,52 +651,52 @@ NS_IMETHODIMP nsMailDatabase::ListAllOfflineOpIds(nsMsgKeyArray *offlineOpIds)
NS_ENSURE_ARG(offlineOpIds);
nsresult rv = GetAllOfflineOpsTable();
NS_ENSURE_SUCCESS(rv, rv);
nsIMdbTableRowCursor *rowCursor;
if (m_mdbAllOfflineOpsTable)
{
nsresult err = m_mdbAllOfflineOpsTable->GetTableRowCursor(GetEnv(), -1, &rowCursor);
while (err == NS_OK && 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 (err == NS_OK)
offlineOpIds->Add(outOid.mOid_Id);
}
nsIMdbTableRowCursor *rowCursor;
if (m_mdbAllOfflineOpsTable)
{
nsresult err = m_mdbAllOfflineOpsTable->GetTableRowCursor(GetEnv(), -1, &rowCursor);
while (err == NS_OK && 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 (err == NS_OK)
offlineOpIds->Add(outOid.mOid_Id);
}
rv = (err == NS_OK) ? NS_OK : NS_ERROR_FAILURE;
rowCursor->Release();
}
offlineOpIds->QuickSort();
return rv;
rowCursor->Release();
}
offlineOpIds->QuickSort();
return rv;
}
NS_IMETHODIMP nsMailDatabase::ListAllOfflineDeletes(nsMsgKeyArray *offlineDeletes)
{
if (!offlineDeletes)
return NS_ERROR_NULL_POINTER;
if (!offlineDeletes)
return NS_ERROR_NULL_POINTER;
nsresult rv = GetAllOfflineOpsTable();
NS_ENSURE_SUCCESS(rv, rv);
nsIMdbTableRowCursor *rowCursor;
if (m_mdbAllOfflineOpsTable)
{
nsresult err = m_mdbAllOfflineOpsTable->GetTableRowCursor(GetEnv(), -1, &rowCursor);
while (err == NS_OK && rowCursor)
{
mdbOid outOid;
mdb_pos outPos;
nsIMdbTableRowCursor *rowCursor;
if (m_mdbAllOfflineOpsTable)
{
nsresult err = m_mdbAllOfflineOpsTable->GetTableRowCursor(GetEnv(), -1, &rowCursor);
while (err == NS_OK && rowCursor)
{
mdbOid outOid;
mdb_pos outPos;
nsIMdbRow* offlineOpRow;
err = rowCursor->NextRow(GetEnv(), &offlineOpRow, &outPos);
// is this right? Mork is returning a 0 id, but that should valid.
if (outPos < 0 || offlineOpRow == nsnull)
break;
if (err == NS_OK)
err = rowCursor->NextRow(GetEnv(), &offlineOpRow, &outPos);
// is this right? Mork is returning a 0 id, but that should valid.
if (outPos < 0 || offlineOpRow == nsnull)
break;
if (err == NS_OK)
{
offlineOpRow->GetOid(GetEnv(), &outOid);
nsIMsgOfflineImapOperation *offlineOp = new nsMsgOfflineImapOperation(this, offlineOpRow);
@ -705,22 +705,22 @@ NS_IMETHODIMP nsMailDatabase::ListAllOfflineDeletes(nsMsgKeyArray *offlineDelete
NS_ADDREF(offlineOp);
imapMessageFlagsType newFlags;
nsOfflineImapOperationType opType;
offlineOp->GetOperation(&opType);
offlineOp->GetNewFlags(&newFlags);
if (opType & nsIMsgOfflineImapOperation::kMsgMoved ||
((opType & nsIMsgOfflineImapOperation::kFlagsChanged)
&& (newFlags & nsIMsgOfflineImapOperation::kMsgMarkedDeleted)))
offlineDeletes->Add(outOid.mOid_Id);
((opType & nsIMsgOfflineImapOperation::kFlagsChanged)
&& (newFlags & nsIMsgOfflineImapOperation::kMsgMarkedDeleted)))
offlineDeletes->Add(outOid.mOid_Id);
NS_RELEASE(offlineOp);
}
offlineOpRow->Release();
}
}
}
rv = (err == NS_OK) ? NS_OK : NS_ERROR_FAILURE;
rowCursor->Release();
}
return rv;
rowCursor->Release();
}
return rv;
}
/* static */

8
mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
View File

@ -202,7 +202,7 @@ NS_IMETHODIMP nsMsgDatabase::GetMsgHdrCacheSize(PRUint32 *aSize)
NS_IMETHODIMP nsMsgDatabase::ClearCachedHdrs()
{
ClearCachedObjects(PR_FALSE);
#ifdef DEBUG_bienvenu
#ifdef DEBUG_bienvenu1
if (mRefCnt > 1)
{
NS_ASSERTION(PR_FALSE, "");
@ -215,7 +215,7 @@ NS_IMETHODIMP nsMsgDatabase::ClearCachedHdrs()
void nsMsgDatabase::ClearCachedObjects(PRBool dbGoingAway)
{
ClearHdrCache(PR_FALSE);
#ifdef DEBUG_bienvenu
#ifdef DEBUG_bienvenu1
if (m_headersInUse && m_headersInUse->entryCount > 0)
{
NS_ASSERTION(PR_FALSE, "leaking headers");
@ -1310,7 +1310,6 @@ nsresult nsMsgDatabase::InitExistingDB()
// create new all msg hdrs table, if it doesn't exist.
if (NS_SUCCEEDED(err) && !m_mdbAllMsgHeadersTable)
{
nsIMdbStore *store = GetStore();
struct mdbOid allMsgHdrsTableOID;
allMsgHdrsTableOID.mOid_Scope = m_hdrRowScopeToken;
allMsgHdrsTableOID.mOid_Id = kAllMsgHdrsTableKey;
@ -3366,7 +3365,7 @@ nsIMsgThread * nsMsgDatabase::GetThreadForSubject(nsCString &subject)
// find thread header for header whose message id we matched.
thread = GetThreadForThreadId(key);
}
#ifdef DEBUG_bienvenu
#ifdef DEBUG_bienvenu1
else
{
nsresult rv;
@ -4152,7 +4151,6 @@ nsresult nsMsgDatabase::PurgeMessagesOlderThan(PRUint32 daysToKeepHdrs, PRBool k
nsresult nsMsgDatabase::PurgeExcessMessages(PRUint32 numHeadersToKeep, PRBool keepUnreadMessagesOnly)
{
nsresult rv = NS_OK;
PRInt32 numPurged = 0;
nsMsgHdr *pHeader;
nsCOMPtr <nsISimpleEnumerator> hdrs;
rv = EnumerateMessages(getter_AddRefs(hdrs));

4
mozilla/mailnews/db/msgdb/src/nsMsgOfflineImapOperation.cpp
View File

@ -149,7 +149,7 @@ NS_IMETHODIMP nsMsgOfflineImapOperation::GetNewFlags(imapMessageFlagsType *aNewF
PRUint32 flags;
nsresult rv = m_mdb->GetUint32Property(m_mdbRow, PROP_NEW_FLAGS, &flags, 0);
*aNewFlags = m_newFlags = (imapMessageFlagsType) flags;
return NS_OK;
return rv;
}
NS_IMETHODIMP nsMsgOfflineImapOperation::SetNewFlags(imapMessageFlagsType aNewFlags)
@ -180,7 +180,7 @@ NS_IMETHODIMP nsMsgOfflineImapOperation::GetSourceFolderURI(char * *aSourceFolde
NS_ENSURE_ARG(aSourceFolderURI);
nsresult rv = m_mdb->GetProperty(m_mdbRow, PROP_SRC_FOLDER_URI, getter_Copies(m_sourceFolder));
*aSourceFolderURI = nsCRT::strdup(m_sourceFolder);
return NS_OK;
return rv;
}
NS_IMETHODIMP nsMsgOfflineImapOperation::SetSourceFolderURI(const char * aSourceFolderURI)