зеркало из https://github.com/mozilla/gecko-dev.git
fix warnings
This commit is contained in:
Родитель
87c22a9dec
Коммит
4aed0216c8
|
@ -1109,7 +1109,6 @@ mork_bool morkParser::ReadAt(morkEnv* ev, mork_bool inInsideGroup)
|
|||
{
|
||||
morkStream* s = mParser_Stream;
|
||||
register int c;
|
||||
int next = 0;
|
||||
if ( ((c = s->Getc(ev)) == '{' || c == '}') && ev->Good() )
|
||||
{
|
||||
if ( c == '{' ) // start of new group?
|
||||
|
|
|
@ -92,7 +92,8 @@ morkStream::morkStream(morkEnv* ev, const morkUsage& inUsage,
|
|||
if ( ioContentFile->FileFrozen() ) // forced to be readonly?
|
||||
inFrozen = morkBool_kTrue; // override the input value
|
||||
|
||||
mork_pos fileEnd = ioContentFile->Length(ev);
|
||||
mork_pos fileEnd;
|
||||
fileEnd = ioContentFile->Length(ev);
|
||||
|
||||
morkFile::SlotStrongFile(ioContentFile, ev, &mStream_ContentFile);
|
||||
if ( ev->Good() )
|
||||
|
|
|
@ -1988,7 +1988,8 @@ morkWriter::PutRow(morkEnv* ev, morkRow* ioRow)
|
|||
mWriter_LineSize = stream->PutIndent(ev, 0); // no indent
|
||||
}
|
||||
|
||||
mork_rid rid = roid->mOid_Id;
|
||||
mork_rid rid;
|
||||
rid = roid->mOid_Id;
|
||||
*p++ = '['; // start row punct=1
|
||||
mork_size punctSize = 9; // counting "{ /*r=*/ "
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@ nsresult NS_MsgGetAttributeFromString(const char *string, int16 *attrib)
|
|||
if (NULL == string || NULL == attrib)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
PRBool found = FALSE;
|
||||
for (int idxAttrib = 0; idxAttrib < sizeof(SearchAttribEntryTable) / sizeof(nsMsgSearchAttribEntry); idxAttrib++)
|
||||
for (int idxAttrib = 0; idxAttrib < (int)(sizeof(SearchAttribEntryTable) / sizeof(nsMsgSearchAttribEntry)); idxAttrib++)
|
||||
{
|
||||
if (!PL_strcasecmp(string, SearchAttribEntryTable[idxAttrib].attribName))
|
||||
{
|
||||
|
@ -79,7 +79,7 @@ nsresult NS_MsgGetStringForAttribute(int16 attrib, const char **string)
|
|||
if (NULL == string)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
PRBool found = FALSE;
|
||||
for (int idxAttrib = 0; idxAttrib < sizeof(SearchAttribEntryTable) / sizeof(nsMsgSearchAttribEntry); idxAttrib++)
|
||||
for (int idxAttrib = 0; idxAttrib < (int)(sizeof(SearchAttribEntryTable) / sizeof(nsMsgSearchAttribEntry)); idxAttrib++)
|
||||
{
|
||||
// I'm using the idx's as aliases into MSG_SearchAttribute and
|
||||
// MSG_SearchOperator enums which is legal because of the way the
|
||||
|
|
|
@ -1109,7 +1109,6 @@ mork_bool morkParser::ReadAt(morkEnv* ev, mork_bool inInsideGroup)
|
|||
{
|
||||
morkStream* s = mParser_Stream;
|
||||
register int c;
|
||||
int next = 0;
|
||||
if ( ((c = s->Getc(ev)) == '{' || c == '}') && ev->Good() )
|
||||
{
|
||||
if ( c == '{' ) // start of new group?
|
||||
|
|
|
@ -92,7 +92,8 @@ morkStream::morkStream(morkEnv* ev, const morkUsage& inUsage,
|
|||
if ( ioContentFile->FileFrozen() ) // forced to be readonly?
|
||||
inFrozen = morkBool_kTrue; // override the input value
|
||||
|
||||
mork_pos fileEnd = ioContentFile->Length(ev);
|
||||
mork_pos fileEnd;
|
||||
fileEnd = ioContentFile->Length(ev);
|
||||
|
||||
morkFile::SlotStrongFile(ioContentFile, ev, &mStream_ContentFile);
|
||||
if ( ev->Good() )
|
||||
|
|
|
@ -1988,7 +1988,8 @@ morkWriter::PutRow(morkEnv* ev, morkRow* ioRow)
|
|||
mWriter_LineSize = stream->PutIndent(ev, 0); // no indent
|
||||
}
|
||||
|
||||
mork_rid rid = roid->mOid_Id;
|
||||
mork_rid rid;
|
||||
rid = roid->mOid_Id;
|
||||
*p++ = '['; // start row punct=1
|
||||
mork_size punctSize = 9; // counting "{ /*r=*/ "
|
||||
|
||||
|
|
|
@ -2286,8 +2286,8 @@ nsIMsgThread * nsMsgDatabase::GetThreadForSubject(nsString2 &subject)
|
|||
// NS_ASSERTION(PR_FALSE, "not implemented yet.");
|
||||
nsIMsgThread *thread = NULL;
|
||||
|
||||
nsIMsgDBHdr *msgHdr = nsnull;
|
||||
nsresult rv = NS_OK;
|
||||
//nsIMsgDBHdr *msgHdr = nsnull;
|
||||
//nsresult rv = NS_OK;
|
||||
mdbYarn subjectYarn;
|
||||
|
||||
subjectYarn.mYarn_Buf = (void*)subject.GetBuffer();
|
||||
|
|
|
@ -1394,7 +1394,8 @@ NS_IMETHODIMP nsImapMailFolder::SetupHeaderParseStream(
|
|||
rootDir->GetFileSpec(&filterFile);
|
||||
// need a file spec for filters...
|
||||
filterFile += "rules.dat";
|
||||
nsresult res = filterService->OpenFilterList(&filterFile, getter_AddRefs(m_filterList));
|
||||
nsresult res;
|
||||
res = filterService->OpenFilterList(&filterFile, getter_AddRefs(m_filterList));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3052,8 +3053,8 @@ nsImapMailFolder::CopyStreamMessage(nsIMessage* message,
|
|||
}
|
||||
|
||||
nsImapMailCopyState::nsImapMailCopyState() : m_msgService(nsnull),
|
||||
m_isMove(PR_FALSE), m_curIndex(0), m_totalCount(0),
|
||||
m_selectedState(PR_FALSE), m_dataBuffer(nsnull)
|
||||
m_isMove(PR_FALSE), m_selectedState(PR_FALSE), m_curIndex(0), m_totalCount(0),
|
||||
m_dataBuffer(nsnull)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -1253,7 +1253,8 @@ void nsImapProtocol::ProcessSelectedStateURL()
|
|||
nsString2 urlHost("",eOneByte);
|
||||
|
||||
// this can't fail, can it?
|
||||
nsresult res = m_runningUrl->GetImapAction(&imapAction);
|
||||
nsresult res;
|
||||
res = m_runningUrl->GetImapAction(&imapAction);
|
||||
m_runningUrl->MessageIdsAreUids(&bMessageIdsAreUids);
|
||||
m_runningUrl->GetMsgFlags(&msgFlags);
|
||||
|
||||
|
|
|
@ -849,7 +849,8 @@ void nsImapServerResponseParser::mailbox(mailbox_spec *boxSpec)
|
|||
|
||||
char *convertedName =
|
||||
fServerConnection.CreateUtf7ConvertedString(boxname, PR_FALSE);
|
||||
PRUnichar *unicharName = fServerConnection.CreatePRUnicharStringFromUTF7(boxname);
|
||||
PRUnichar *unicharName;
|
||||
unicharName = fServerConnection.CreatePRUnicharStringFromUTF7(boxname);
|
||||
PL_strfree(boxname);
|
||||
boxname = convertedName;
|
||||
}
|
||||
|
|
|
@ -67,8 +67,9 @@ static NS_DEFINE_CID(kMsgCopyServiceCID, NS_MSGCOPYSERVICE_CID);
|
|||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
nsLocalMailCopyState::nsLocalMailCopyState() :
|
||||
fileStream(nsnull), curDstKey(0xffffffff), curCopyIndex(0),
|
||||
messageService(nsnull), totalMsgCount(0)
|
||||
fileStream(nsnull), messageService(nsnull),
|
||||
curCopyIndex(0), curDstKey(0xffffffff),
|
||||
totalMsgCount(0)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -51,8 +51,8 @@ struct nsLocalMailCopyState
|
|||
|
||||
nsIMsgMessageService* messageService;
|
||||
PRBool isMove;
|
||||
nsMsgKey curDstKey;
|
||||
PRUint32 curCopyIndex;
|
||||
nsMsgKey curDstKey;
|
||||
PRUint32 totalMsgCount;
|
||||
char dataBuffer[FOUR_K];
|
||||
};
|
||||
|
|
|
@ -1395,7 +1395,8 @@ nsParseNewMailState::Init(nsIFolder *rootFolder, nsFileSpec &folder, nsIOFileStr
|
|||
rootDir->GetFileSpec(&filterFile);
|
||||
// need a file spec for filters...
|
||||
filterFile += "rules.dat";
|
||||
nsresult res = filterService->OpenFilterList(&filterFile, getter_AddRefs(m_filterList));
|
||||
nsresult res;
|
||||
res = filterService->OpenFilterList(&filterFile, getter_AddRefs(m_filterList));
|
||||
}
|
||||
|
||||
m_logFile = nsnull;
|
||||
|
@ -1599,7 +1600,8 @@ void nsParseNewMailState::ApplyFilters(PRBool *pMoved)
|
|||
NS_ADDREF(inbox);
|
||||
char * headers = m_headers.GetBuffer();
|
||||
PRUint32 headersSize = m_headers.GetBufferPos();
|
||||
nsresult matchTermStatus = m_filterList->ApplyFiltersToHdr(nsMsgFilterType::InboxRule, msgHdr, inbox,
|
||||
nsresult matchTermStatus;
|
||||
matchTermStatus = m_filterList->ApplyFiltersToHdr(nsMsgFilterType::InboxRule, msgHdr, inbox,
|
||||
m_mailDB, headers, headersSize, this);
|
||||
NS_IF_RELEASE(inbox);
|
||||
}
|
||||
|
|
|
@ -977,7 +977,6 @@ static int OutputAdvancedVcard(MimeObject *obj, VObject *v)
|
|||
static int OutputButtons(MimeObject *obj, PRBool basic, VObject *v)
|
||||
{
|
||||
int status = 0;
|
||||
char * htmlLine = NULL;
|
||||
char * htmlLine1 = NULL;
|
||||
char * htmlLine2 = NULL;
|
||||
char* vCard = NULL;
|
||||
|
@ -1554,7 +1553,6 @@ static int WriteOutEachVCardProperty (MimeObject *obj, VObject* o, int* numEmail
|
|||
char *attribName = NULL;
|
||||
char * url = NULL;
|
||||
char *value = NULL;
|
||||
char *ptr = NULL;
|
||||
int status = 0;
|
||||
|
||||
if (vObjectName(o)) {
|
||||
|
|
|
@ -624,7 +624,7 @@ nsNNTPNewsgroupList::ParseLine(char *line, PRUint32 * message_number)
|
|||
if (PR_SUCCESS == status) {
|
||||
|
||||
#ifdef DEBUG_NEWS
|
||||
printf("date = %s, %ld\n", line, date);
|
||||
printf("date = %s\n", line);
|
||||
#endif
|
||||
rv = newMsgHdr->SetDate(date); /* date */
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
|
Загрузка…
Ссылка в новой задаче