Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

whitespace code cleanup, no bug, r/sr=me

Browse Source
This commit is contained in:
bienvenu%nventure.com 2003-09-11 02:46:16 +00:00
parent cf96db37ec
commit 446f289dac
2 changed files with 137 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,7 +204,7 @@ void nsMsgDBView::InitializeAtomsAndLiterals()
nsMsgDBView::~nsMsgDBView()
{
if (m_db)
m_db->RemoveListener(this);
m_db->RemoveListener(this);
gInstanceCount--;
if (gInstanceCount <= 0)
@ -385,24 +385,24 @@ NS_IMETHODIMP nsMsgDBView::Observe(nsISupports *aSubject, const char *aTopic, co
// helper function used to fetch strings from the messenger string bundle
PRUnichar * nsMsgDBView::GetString(const PRUnichar *aStringName)
{
nsresult res = NS_OK;
PRUnichar *ptrv = nsnull;
if (!mMessengerStringBundle)
{
static const char propertyURL[] = MESSENGER_STRING_URL;
nsresult res = NS_OK;
PRUnichar *ptrv = nsnull;
if (!mMessengerStringBundle)
{
static const char propertyURL[] = MESSENGER_STRING_URL;
nsCOMPtr<nsIStringBundleService> sBundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &res);
if (NS_SUCCEEDED(res) && sBundleService)
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mMessengerStringBundle));
}
if (mMessengerStringBundle)
res = mMessengerStringBundle->GetStringFromName(aStringName, &ptrv);
if ( NS_SUCCEEDED(res) && (ptrv) )
return ptrv;
else
return nsCRT::strdup(aStringName);
if (NS_SUCCEEDED(res) && sBundleService)
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mMessengerStringBundle));
}
if (mMessengerStringBundle)
res = mMessengerStringBundle->GetStringFromName(aStringName, &ptrv);
if ( NS_SUCCEEDED(res) && (ptrv) )
return ptrv;
else
return nsCRT::strdup(aStringName);
}
// helper function used to fetch localized strings from the prefs
@ -557,7 +557,7 @@ nsresult nsMsgDBView::FetchDate(nsIMsgHdr * aHdr, PRUnichar ** aDateString)
nsresult rv = aHdr->GetDate(&dateOfMsg);
PRTime currentTime = PR_Now();
PRExplodedTime explodedCurrentTime;
PRExplodedTime explodedCurrentTime;
PR_ExplodeTime(currentTime, PR_LocalTimeParameters, &explodedCurrentTime);
PRExplodedTime explodedMsgTime;
PR_ExplodeTime(dateOfMsg, PR_LocalTimeParameters, &explodedMsgTime);
@ -632,21 +632,21 @@ nsresult nsMsgDBView::FetchDate(nsIMsgHdr * aHdr, PRUnichar ** aDateString)
nsresult nsMsgDBView::FetchStatus(PRUint32 aFlags, PRUnichar ** aStatusString)
{
const PRUnichar * statusString = nsnull;
if(aFlags & MSG_FLAG_REPLIED)
statusString = kRepliedString;
else if(aFlags & MSG_FLAG_FORWARDED)
statusString = kForwardedString;
else if(aFlags & MSG_FLAG_NEW)
statusString = kNewString;
else if(aFlags & MSG_FLAG_READ)
statusString = kReadString;
else if(aFlags & MSG_FLAG_FORWARDED)
statusString = kForwardedString;
else if(aFlags & MSG_FLAG_NEW)
statusString = kNewString;
else if(aFlags & MSG_FLAG_READ)
statusString = kReadString;
if (statusString)
*aStatusString = nsCRT::strdup(statusString);
else
*aStatusString = nsnull;
return NS_OK;
}
@ -654,25 +654,27 @@ nsresult nsMsgDBView::FetchSize(nsIMsgHdr * aHdr, PRUnichar ** aSizeString)
{
nsAutoString formattedSizeString;
PRUint32 msgSize = 0;
// for news, show the line count not the size
if (mIsNews) {
if (mIsNews)
{
aHdr->GetLineCount(&msgSize);
formattedSizeString.AppendInt(msgSize);
}
else {
else
{
aHdr->GetMessageSize(&msgSize);
if(msgSize < 1024)
msgSize = 1024;
if(msgSize < 1024)
msgSize = 1024;
PRUint32 sizeInKB = msgSize/1024;
formattedSizeString.AppendInt(sizeInKB);
// XXX todo, fix this hard coded string?
formattedSizeString.Append(NS_LITERAL_STRING("KB"));
}
*aSizeString = ToNewUnicode(formattedSizeString);
return NS_OK;
}
@ -937,7 +939,8 @@ nsresult nsMsgDBView::UpdateDisplayMessage(nsMsgKey aMsgKey)
mCommandUpdater->DisplayMessageChanged(m_folder, subject, keywords);
if (m_folder) {
if (m_folder)
{
rv = m_folder->SetLastMessageLoaded(aMsgKey);
NS_ENSURE_SUCCESS(rv,rv);
}
@ -1146,7 +1149,8 @@ NS_IMETHODIMP nsMsgDBView::GetCellProperties(PRInt32 aRow, const PRUnichar *colI
rv = GetMsgHdrForViewIndex(aRow, getter_AddRefs(msgHdr));
if (NS_FAILED(rv) || !msgHdr) {
if (NS_FAILED(rv) || !msgHdr)
{
ClearHdrCache();
return NS_MSG_INVALID_DBVIEW_INDEX;
}
@ -1356,10 +1360,12 @@ NS_IMETHODIMP nsMsgDBView::GetParentIndex(PRInt32 rowIndex, PRInt32 *_retval)
GetLevel(rowIndex, &rowIndexLevel);
PRInt32 i;
for(i = rowIndex; i >= 0; i--) {
for(i = rowIndex; i >= 0; i--)
{
PRInt32 l;
GetLevel(i, &l);
if (l < rowIndexLevel) {
if (l < rowIndexLevel)
{
*_retval = i;
break;
}
@ -1378,12 +1384,14 @@ NS_IMETHODIMP nsMsgDBView::HasNextSibling(PRInt32 rowIndex, PRInt32 afterIndex,
PRInt32 i;
PRInt32 count;
GetRowCount(&count);
for(i = afterIndex + 1; i < count; i++) {
for(i = afterIndex + 1; i < count; i++)
{
PRInt32 l;
GetLevel(i, &l);
if (l < rowIndexLevel)
break;
if (l == rowIndexLevel) {
if (l == rowIndexLevel)
{
*_retval = PR_TRUE;
break;
}
@ -2188,10 +2196,8 @@ nsMsgDBView::ApplyCommandToIndices(nsMsgViewCommandTypeValue command, nsMsgViewI
nsMsgKeyArray imapUids;
// if numIndices == 0, return quietly, just in case
//
if (numIndices == 0) {
if (numIndices == 0)
return NS_OK;
}
NS_ASSERTION(numIndices >= 0, "nsMsgDBView::ApplyCommandToIndices(): "
"numIndices is negative!");

170
mailnews/base/src/nsMsgFolderCacheElement.cpp
View File

@ -42,17 +42,17 @@
nsMsgFolderCacheElement::nsMsgFolderCacheElement()
{
m_mdbRow = nsnull;
m_owningCache = nsnull;
m_folderKey = nsnull;
m_mdbRow = nsnull;
m_owningCache = nsnull;
m_folderKey = nsnull;
}
nsMsgFolderCacheElement::~nsMsgFolderCacheElement()
{
NS_IF_RELEASE(m_mdbRow);
// circular reference, don't do it.
// NS_IF_RELEASE(m_owningCache);
PR_FREEIF(m_folderKey);
NS_IF_RELEASE(m_mdbRow);
// circular reference, don't do it.
// NS_IF_RELEASE(m_owningCache);
PR_FREEIF(m_folderKey);
}
@ -63,102 +63,102 @@ NS_IMPL_SETTER_STR(nsMsgFolderCacheElement::SetKey, m_folderKey)
void nsMsgFolderCacheElement::SetOwningCache(nsMsgFolderCache *owningCache)
{
m_owningCache = owningCache;
// circular reference, don't do it.
// if (owningCache)
// NS_ADDREF(owningCache);
m_owningCache = owningCache;
// circular reference, don't do it.
// if (owningCache)
// NS_ADDREF(owningCache);
}
NS_IMETHODIMP nsMsgFolderCacheElement::GetStringProperty(const char *propertyName, char **result)
{
if (!propertyName || !result || !m_mdbRow || !m_owningCache)
return NS_ERROR_NULL_POINTER;
mdb_token property_token;
nsresult ret = m_owningCache->GetStore()->StringToToken(m_owningCache->GetEnv(), propertyName, &property_token);
if (ret == NS_OK)
{
ret = m_owningCache->RowCellColumnToCharPtr(m_mdbRow, property_token, result);
}
return ret;
if (!propertyName || !result || !m_mdbRow || !m_owningCache)
return NS_ERROR_NULL_POINTER;
mdb_token property_token;
nsresult ret = m_owningCache->GetStore()->StringToToken(m_owningCache->GetEnv(), propertyName, &property_token);
if (ret == NS_OK)
{
ret = m_owningCache->RowCellColumnToCharPtr(m_mdbRow, property_token, result);
}
return ret;
}
NS_IMETHODIMP nsMsgFolderCacheElement::GetInt32Property(const char *propertyName, PRInt32 *aResult)
{
if (!propertyName || !aResult || !m_mdbRow)
return NS_ERROR_NULL_POINTER;
char *resultStr = nsnull;
GetStringProperty(propertyName, &resultStr);
if (!resultStr)
return NS_ERROR_NULL_POINTER;
PRInt32 result;
char *p = resultStr;
for (result = 0; *p; p++)
{
char C = *p;
PRInt8 unhex = ((C >= '0' && C <= '9') ? C - '0' :
((C >= 'A' && C <= 'F') ? C - 'A' + 10 :
((C >= 'a' && C <= 'f') ? C - 'a' + 10 : -1)));
if (unhex < 0)
break;
result = (result << 4) | unhex;
}
PR_FREEIF(resultStr);
*aResult = result;
return NS_OK;
if (!propertyName || !aResult || !m_mdbRow)
return NS_ERROR_NULL_POINTER;
char *resultStr = nsnull;
GetStringProperty(propertyName, &resultStr);
if (!resultStr)
return NS_ERROR_NULL_POINTER;
PRInt32 result;
char *p = resultStr;
for (result = 0; *p; p++)
{
char C = *p;
PRInt8 unhex = ((C >= '0' && C <= '9') ? C - '0' :
((C >= 'A' && C <= 'F') ? C - 'A' + 10 :
((C >= 'a' && C <= 'f') ? C - 'a' + 10 : -1)));
if (unhex < 0)
break;
result = (result << 4) | unhex;
}
PR_Free(resultStr);
*aResult = result;
return NS_OK;
}
NS_IMETHODIMP nsMsgFolderCacheElement::SetStringProperty(const char *propertyName, const char *propertyValue)
{
if (!propertyName || !m_mdbRow)
return NS_ERROR_NULL_POINTER;
nsresult err = NS_OK;
mdb_token property_token;
if (m_owningCache)
{
err = m_owningCache->GetStore()->StringToToken(m_owningCache->GetEnv(), propertyName, &property_token);
if (err == NS_OK)
{
struct mdbYarn yarn;
yarn.mYarn_Grow = NULL;
if (m_mdbRow)
{
yarn.mYarn_Buf = (void *) propertyValue;
yarn.mYarn_Size = PL_strlen((const char *) yarn.mYarn_Buf) + 1;
yarn.mYarn_Fill = yarn.mYarn_Size - 1;
yarn.mYarn_Form = 0; // what to do with this? we're storing csid in the msg hdr...
err = m_mdbRow->AddColumn(m_owningCache->GetEnv(), property_token, &yarn);
return err;
}
}
}
return err;
if (!propertyName || !m_mdbRow)
return NS_ERROR_NULL_POINTER;
nsresult err = NS_OK;
mdb_token property_token;
if (m_owningCache)
{
err = m_owningCache->GetStore()->StringToToken(m_owningCache->GetEnv(), propertyName, &property_token);
if (err == NS_OK)
{
struct mdbYarn yarn;
yarn.mYarn_Grow = NULL;
if (m_mdbRow)
{
yarn.mYarn_Buf = (void *) propertyValue;
yarn.mYarn_Size = PL_strlen((const char *) yarn.mYarn_Buf) + 1;
yarn.mYarn_Fill = yarn.mYarn_Size - 1;
yarn.mYarn_Form = 0; // what to do with this? we're storing csid in the msg hdr...
err = m_mdbRow->AddColumn(m_owningCache->GetEnv(), property_token, &yarn);
return err;
}
}
}
return err;
}
NS_IMETHODIMP nsMsgFolderCacheElement::SetInt32Property(const char *propertyName, PRInt32 propertyValue)
{
if (!propertyName || !m_mdbRow)
return NS_ERROR_NULL_POINTER;
nsCAutoString propertyStr;
propertyStr.AppendInt(propertyValue, 16);
return SetStringProperty(propertyName, propertyStr.get());
if (!propertyName || !m_mdbRow)
return NS_ERROR_NULL_POINTER;
nsCAutoString propertyStr;
propertyStr.AppendInt(propertyValue, 16);
return SetStringProperty(propertyName, propertyStr.get());
}
void nsMsgFolderCacheElement::SetMDBRow(nsIMdbRow *row)
{
if (m_mdbRow)
NS_RELEASE(m_mdbRow);
m_mdbRow = row;
if (row)
NS_ADDREF(row);
if (m_mdbRow)
NS_RELEASE(m_mdbRow);
m_mdbRow = row;
if (row)
NS_ADDREF(row);
}