From a6ed51abdca027af84d288fa3b92ec1b929a00fd Mon Sep 17 00:00:00 2001 From: "mrbkap%gmail.com" Date: Tue, 21 Jun 2005 04:29:02 +0000 Subject: [PATCH] bug 298264: Change (to if-returns) and remove unnecessary NS_ENSURE_SUCCESS()s to reduce debug clutter. r=jst sr+a=brendan --- parser/htmlparser/src/nsHTMLTokenizer.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/parser/htmlparser/src/nsHTMLTokenizer.cpp b/parser/htmlparser/src/nsHTMLTokenizer.cpp index a87adbd15a1..e051b151969 100644 --- a/parser/htmlparser/src/nsHTMLTokenizer.cpp +++ b/parser/htmlparser/src/nsHTMLTokenizer.cpp @@ -807,9 +807,7 @@ nsresult nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar, result= aToken->Consume(aChar,aScanner,mFlags); if(NS_SUCCEEDED(result)) { - AddToken(aToken,result,&mTokenDeque,theAllocator); - NS_ENSURE_SUCCESS(result, result); eHTMLTags theTag=(eHTMLTags)aToken->GetTypeID(); @@ -980,8 +978,13 @@ nsresult nsHTMLTokenizer::ConsumeEndTag(PRUnichar aChar, // Tell the new token to finish consuming text... result= aToken->Consume(aChar,aScanner,mFlags); AddToken(aToken,result,&mTokenDeque,theAllocator); - NS_ENSURE_SUCCESS(result, result); - + if (NS_FAILED(result)) { + // Note that this early-return here is safe because we have not yet + // added any of our tokens to the queue (AddToken only adds the token if + // result is a success), so we don't need to fall through. + return result; + } + result = aScanner.Peek(aChar); if (NS_FAILED(result)) { aToken->SetInError(PR_TRUE);