corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed warnings and partially fixed M3

Browse Source
This commit is contained in:
rickg@netscape.com
1999-03-16 07:06:48 +00:00
parent 52a7b72e94
commit e69f092f53
6 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
parser/htmlparser/src/nsHTMLTokens.cpp
View File

@@ -683,6 +683,7 @@ static
nsresult ConsumeComment(PRUnichar aChar, nsScanner& aScanner,nsString& aString) {
static nsAutoString gEdibles("!-");
static nsAutoString gMinus("-");
static nsAutoString gWhitespace("\b\t\n\r ");
nsresult result=NS_OK;
/*********************************************************
@@ -705,26 +706,25 @@ nsresult ConsumeComment(PRUnichar aChar, nsScanner& aScanner,nsString& aString)
PRInt32 findpos=kNotFound;
result=aScanner.ReadWhile(aString,gMinus,PR_TRUE,PR_TRUE); //get all available '---'
findpos=aString.RFind("-->");
nsAutoString temp("");
//nsAutoString temp("");
//nsAutoString ws("");
while((kNotFound==findpos) && (NS_OK==result)) {
result=aScanner.ReadUntil(temp,kMinus,PR_TRUE);
result=aScanner.ReadUntil(aString,kMinus,PR_TRUE);
if(NS_OK==result) {
result=aScanner.ReadWhile(temp,gMinus,PR_TRUE,PR_FALSE); //get all available '---'
result=aScanner.ReadWhile(aString,gMinus,PR_TRUE,PR_FALSE); //get all available '---'
if(NS_OK==result)
aScanner.SkipWhitespace(); //but skip terminating whitespace...
result=aScanner.ReadWhile(aString,gWhitespace,PR_TRUE,PR_FALSE); //get all available whitespace
}
if(NS_OK==result) {
result=aScanner.GetChar(aChar);
temp+=aChar;
aString+=aChar;
}
findpos=temp.RFind("-->");
findpos=aString.RFind("-->");
if(kNotFound==findpos)
findpos=temp.RFind("!>");
aString+=temp;
temp="";
findpos=aString.RFind("!>");
} //while
return result;
} //if