From 4f974157e977134c65eab8acccbf0859e053f879 Mon Sep 17 00:00:00 2001 From: "peterv%propagandism.org" Date: Fri, 24 Jun 2005 13:21:59 +0000 Subject: [PATCH] Fix for bug 298391 (Remove some unused stuff from parser code). r=mrbkap, sr=jst, a=chofmann. git-svn-id: svn://10.0.0.236/trunk@175091 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/parser/htmlparser/src/nsExpatDriver.cpp | 1 - mozilla/parser/htmlparser/src/nsParser.cpp | 5 ----- mozilla/parser/htmlparser/src/nsScanner.cpp | 15 --------------- 3 files changed, 21 deletions(-) diff --git a/mozilla/parser/htmlparser/src/nsExpatDriver.cpp b/mozilla/parser/htmlparser/src/nsExpatDriver.cpp index ba115c4f717..b0b7db7f0b6 100644 --- a/mozilla/parser/htmlparser/src/nsExpatDriver.cpp +++ b/mozilla/parser/htmlparser/src/nsExpatDriver.cpp @@ -56,7 +56,6 @@ #define kExpatSeparatorChar 0xFFFF -static const char kWhitespace[] = " \r\n\t"; // Optimized for typical cases static const PRUnichar kUTF16[] = { 'U', 'T', 'F', '-', '1', '6', '\0' }; /***************************** EXPAT CALL BACKS ******************************/ diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp index 99a83540936..3c918a53b8e 100644 --- a/mozilla/parser/htmlparser/src/nsParser.cpp +++ b/mozilla/parser/htmlparser/src/nsParser.cpp @@ -37,11 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -#define XMLENCODING_PEEKBYTES 64 -#define DISABLE_TRANSITIONAL_MODE - - - #include "nsIAtom.h" #include "nsParser.h" #include "nsString.h" diff --git a/mozilla/parser/htmlparser/src/nsScanner.cpp b/mozilla/parser/htmlparser/src/nsScanner.cpp index 88720c3aa76..2d78e16cb38 100644 --- a/mozilla/parser/htmlparser/src/nsScanner.cpp +++ b/mozilla/parser/htmlparser/src/nsScanner.cpp @@ -73,9 +73,6 @@ nsReadEndCondition::nsReadEndCondition(const PRUnichar* aTerminateChars) : static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static const char kBadHTMLText[] ="

Oops...

You just tried to read a non-existent document:
"; -static const char kUnorderedStringError[] = "String argument must be ordered. Don't you read API's?"; - #ifdef __INCREMENTAL const int kBufsize=1; #else @@ -420,18 +417,6 @@ nsresult nsScanner::FillBuffer(void) { nsresult result=NS_OK; if(!mInputStream) { -#if 0 - //This is DEBUG code!!!!!! XXX DEBUG XXX - //If you're here, it means someone tried to load a - //non-existent document. So as a favor, we emit a - //little bit of HTML explaining the error. - if(0==mTotalRead) { - mBuffer.Append((const char*)kBadHTMLText); - mBuffer.Append(mFilename); - mTotalRead+=mBuffer.Length(); - } - else -#endif result=kEOF; } else {