Bug 494683 warning: comparison between signed and unsigned and incorrect initialization order

r=jst sr=jst

--HG--
extra : rebase_source : b216615bd1813d661496432f508bb2755aa55877
This commit is contained in:
timeless@mozdev.org 2010-03-12 07:50:13 +01:00
parent ceed664b28
commit c3bbdc001a
7 changed files with 18 additions and 18 deletions

View File

@ -359,31 +359,31 @@ protected:
PRUint32 mDeflectedCount;
// How many times to deflect in interactive/perf modes
PRInt32 mInteractiveDeflectCount;
PRInt32 mPerfDeflectCount;
PRUint32 mInteractiveDeflectCount;
PRUint32 mPerfDeflectCount;
// 0 = don't check for pending events
// 1 = don't deflect if there are pending events
// 2 = bail if there are pending events
PRInt32 mPendingEventMode;
PRUint32 mPendingEventMode;
// How often to probe for pending events. 1=every token
PRInt32 mEventProbeRate;
PRUint32 mEventProbeRate;
// Is there currently a pending event?
PRBool mHasPendingEvent;
// When to return to the main event loop
PRInt32 mCurrentParseEndTime;
PRUint32 mCurrentParseEndTime;
// How long to stay off the event loop in interactive/perf modes
PRInt32 mInteractiveParseTime;
PRInt32 mPerfParseTime;
PRUint32 mInteractiveParseTime;
PRUint32 mPerfParseTime;
// How long to be in interactive mode after an event
PRInt32 mInteractiveTime;
PRUint32 mInteractiveTime;
// How long to stay in perf mode after initial loading
PRInt32 mInitialPerfTime;
PRUint32 mInitialPerfTime;
// Should we switch between perf-mode and interactive-mode
PRBool mEnablePerfMode;

View File

@ -4579,7 +4579,7 @@ nsContentUtils::RemoveScriptBlocker()
--lastBlocker;
runnable->Run();
NS_ASSERTION(lastBlocker == sBlockedScriptRunners->Count() &&
NS_ASSERTION(lastBlocker == (PRUint32)sBlockedScriptRunners->Count() &&
sRunnersCountAtFirstBlocker == 0,
"Bad count");
NS_ASSERTION(!sScriptBlockerCount, "This is really bad");

View File

@ -671,11 +671,11 @@ nsDocumentEncoder::SerializeRangeNodes(nsIDOMRange* aRange,
// get start and end nodes for this recursion level
nsCOMPtr<nsIContent> startNode, endNode;
PRInt32 start = mStartRootIndex - aDepth;
if (start >= 0 && start <= mStartNodes.Length())
if (start >= 0 && (PRUint32)start <= mStartNodes.Length())
startNode = mStartNodes[start];
PRInt32 end = mEndRootIndex - aDepth;
if (end >= 0 && end <= mEndNodes.Length())
if (end >= 0 && (PRUint32)end <= mEndNodes.Length())
endNode = mEndNodes[end];
if ((startNode != content) && (endNode != content))

View File

@ -1386,7 +1386,7 @@ nsPlainTextSerializer::AddToLine(const PRUnichar * aLineFragment,
// try to find another place to break
goodSpace=(prefixwidth>mWrapColumn+1)?1:mWrapColumn-prefixwidth+1;
if (mLineBreaker) {
if (goodSpace < mCurrentLine.Length())
if ((PRUint32)goodSpace < mCurrentLine.Length())
goodSpace = mLineBreaker->Next(mCurrentLine.get(),
mCurrentLine.Length(), goodSpace);
if (goodSpace == NS_LINEBREAKER_NEED_MORE_TEXT)

View File

@ -1484,7 +1484,7 @@ nsXMLContentSerializer::AppendWrapped_NonWhitespaceSequence(
PRBool thisSequenceStartsAtBeginningOfLine = !mColPos;
PRBool onceAgainBecauseWeAddedBreakInFront = PR_FALSE;
PRBool foundWhitespaceInLoop;
PRInt32 length, colPos;
PRUint32 length, colPos;
do {

View File

@ -354,7 +354,7 @@ class nsXMLContentSerializer : public nsIContentSerializer {
nsCString mCharset;
// current column position on the current line
PRInt32 mColPos;
PRUint32 mColPos;
// true = pretty formating should be done (OutputFormated flag)
PRPackedBool mDoFormat;
@ -367,7 +367,7 @@ class nsXMLContentSerializer : public nsIContentSerializer {
PRPackedBool mDoWrap;
// number of maximum column in a line, in the wrap mode
PRInt32 mMaxColumn;
PRUint32 mMaxColumn;
// current indent value
nsString mIndent;

View File

@ -746,7 +746,7 @@ nsHTMLSelectElement::SetLength(PRUint32 aLength)
rv = AppendChild(node, getter_AddRefs(tmpNode));
NS_ENSURE_SUCCESS(rv, rv);
if (i < ((PRInt32)aLength - 1)) {
if (i + 1 < aLength) {
nsCOMPtr<nsIDOMNode> newNode;
rv = node->CloneNode(PR_TRUE, getter_AddRefs(newNode));
@ -2006,7 +2006,7 @@ nsHTMLOptionCollection::Remove(PRInt32 aIndex)
PRUint32 len = 0;
mSelect->GetLength(&len);
if (aIndex < 0 || aIndex >= len)
if (aIndex < 0 || (PRUint32)aIndex >= len)
aIndex = 0;
return mSelect->Remove(aIndex);