Commit 01d9f403 authored by harishd%netscape.com's avatar harishd%netscape.com
Browse files

95614 - Initialized an iterator and replaced NS_ENSURE_SUCCESS ( which... 

95614 - Initialized an iterator and replaced NS_ENSURE_SUCCESS ( which asserts), since the result code from nsScanner::Peek() does not indicate an exceptional condition, with equivalent code. r=heikki, sr=waterson.
parent 05b1b296

htmlparser/src/nsHTMLTokens.cpp

+1 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aFlag) 
  start = origin;

  ++start;

  aScanner.SetPosition(start);

  aScanner.EndReading(end);



  while((NS_OK==result) && (!done)) {

    result=aScanner.ReadUntil(start, end, theEndCondition, PR_FALSE);

htmlparser/src/nsScanner.cpp

+18 −13
Original line number Diff line number Diff line
@@ -561,7 +561,10 @@ nsresult nsScanner::SkipWhitespace(void) { 


  PRUnichar         theChar=0;

  nsresult          result=Peek(theChar);

  NS_ENSURE_SUCCESS(result, result);

  

  if (result == kEOF) {

    return Eof();

  }

  

  while (current != mEndPosition) {

    switch(theChar) {
@@ -584,18 +587,14 @@ nsresult nsScanner::SkipWhitespace(void) { 
    skipped = PR_TRUE;

  }



  if (!skipped)

    return NS_OK;

  

  if (current == mEndPosition) {

  if (skipped) {

    SetPosition(current);

    if (current == mEndPosition) {

      return Eof();

    }



  SetPosition(current);

  }



  return NS_OK;



}



/**
@@ -1195,7 +1194,10 @@ nsresult nsScanner::ReadUntil(nsAWritableString& aString, 


  PRUnichar         theChar=0;

  nsresult          result=Peek(theChar);

  NS_ENSURE_SUCCESS(result, result);



  if (result == kEOF) {

    return Eof();

  }

  

  while (current != mEndPosition) {

    // Filter out completely wrong characters
@@ -1251,7 +1253,11 @@ nsresult nsScanner::ReadUntil(nsReadingIterator<PRUnichar>& aStart, 


  PRUnichar         theChar=0;

  nsresult          result=Peek(theChar);

  NS_ENSURE_SUCCESS(result, result);

  

  if (result == kEOF) {

    aStart = aEnd = current;

    return Eof();

  }

  

  while (current != mEndPosition) {

    // Filter out completely wrong characters
@@ -1310,7 +1316,6 @@ nsresult nsScanner::ReadUntil(nsAWritableString& aString, 


  PRUnichar theChar;

  nsresult  result=Peek(theChar);

  NS_ENSURE_SUCCESS(result, result);

  

  while (current != mEndPosition) {

    if (aTerminalChar == theChar) {

parser/htmlparser/src/nsHTMLTokens.cpp

+1 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aFlag) 
  start = origin;

  ++start;

  aScanner.SetPosition(start);

  aScanner.EndReading(end);



  while((NS_OK==result) && (!done)) {

    result=aScanner.ReadUntil(start, end, theEndCondition, PR_FALSE);

parser/htmlparser/src/nsScanner.cpp

+18 −13
Original line number Diff line number Diff line
@@ -561,7 +561,10 @@ nsresult nsScanner::SkipWhitespace(void) { 


  PRUnichar         theChar=0;

  nsresult          result=Peek(theChar);

  NS_ENSURE_SUCCESS(result, result);

  

  if (result == kEOF) {

    return Eof();

  }

  

  while (current != mEndPosition) {

    switch(theChar) {
@@ -584,18 +587,14 @@ nsresult nsScanner::SkipWhitespace(void) { 
    skipped = PR_TRUE;

  }



  if (!skipped)

    return NS_OK;

  

  if (current == mEndPosition) {

  if (skipped) {

    SetPosition(current);

    if (current == mEndPosition) {

      return Eof();

    }



  SetPosition(current);

  }



  return NS_OK;



}



/**
@@ -1195,7 +1194,10 @@ nsresult nsScanner::ReadUntil(nsAWritableString& aString, 


  PRUnichar         theChar=0;

  nsresult          result=Peek(theChar);

  NS_ENSURE_SUCCESS(result, result);



  if (result == kEOF) {

    return Eof();

  }

  

  while (current != mEndPosition) {

    // Filter out completely wrong characters
@@ -1251,7 +1253,11 @@ nsresult nsScanner::ReadUntil(nsReadingIterator<PRUnichar>& aStart, 


  PRUnichar         theChar=0;

  nsresult          result=Peek(theChar);

  NS_ENSURE_SUCCESS(result, result);

  

  if (result == kEOF) {

    aStart = aEnd = current;

    return Eof();

  }

  

  while (current != mEndPosition) {

    // Filter out completely wrong characters
@@ -1310,7 +1316,6 @@ nsresult nsScanner::ReadUntil(nsAWritableString& aString, 


  PRUnichar theChar;

  nsresult  result=Peek(theChar);

  NS_ENSURE_SUCCESS(result, result);

  

  while (current != mEndPosition) {

    if (aTerminalChar == theChar) {