Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed ABW in nsTagStack and updated to string2 API

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@29952 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rickg%netscape.com
1999-05-02 00:37:25 +00:00
parent cf037dd9f7
commit 3d80de2210
6 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/htmlparser/src/nsDTDUtils.cpp
View File

@@ -61,17 +61,14 @@ void nsTagStack::Empty(void) {
*/
void nsTagStack::Push(eHTMLTags aTag) {
if(mCount==mCapacity){
nsTagEntry* temp=new nsTagEntry[mCapacity+50];
if(mCapacity){
PRUint32 index=0;
for(index=0;index<mCount;index++) {
temp[index]=mEntries[index];
}
delete [] mEntries;
nsTagEntry* temp=new nsTagEntry[mCapacity+=50];
PRUint32 index=0;
for(index=0;index<mCount;index++) {
temp[index]=mEntries[index];
}
delete [] mEntries;
mEntries=temp;
}
mCapacity+=50;
mEntries[mCount].mTag=aTag;
mEntries[mCount].mBankIndex=-1;
mEntries[mCount++].mStyleIndex=-1;

2
mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp
View File

@@ -542,7 +542,7 @@ void nsHTMLContentSinkStream::UnicodeToHTMLString(const nsString& aSrc)
PRInt32 bufferLength = mBufferSize;
mUnicodeEncoder->Reset();
nsresult result = mUnicodeEncoder->Convert(data, &length, mBuffer, &bufferLength);
nsresult result = mUnicodeEncoder->Convert(data.GetUnicode(), &length, mBuffer, &bufferLength);
mBuffer[bufferLength] = 0;
PRInt32 temp = bufferLength;
if (NS_SUCCEEDED(result))

2
mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp
View File

@@ -487,7 +487,7 @@ void nsHTMLToTXTSinkStream::UnicodeToTXTString(const nsString& aSrc)
bufferLength = mBufferSize;
mUnicodeEncoder->Reset();
result = mUnicodeEncoder->Convert(aSrc, &length, mBuffer, &bufferLength);
result = mUnicodeEncoder->Convert(aSrc.GetUnicode(), &length, mBuffer, &bufferLength);
mBuffer[bufferLength] = 0;
PRInt32 temp = bufferLength;
if (NS_SUCCEEDED(result))

13
mozilla/parser/htmlparser/src/nsDTDUtils.cpp
View File

@@ -61,17 +61,14 @@ void nsTagStack::Empty(void) {
*/
void nsTagStack::Push(eHTMLTags aTag) {
if(mCount==mCapacity){
nsTagEntry* temp=new nsTagEntry[mCapacity+50];
if(mCapacity){
PRUint32 index=0;
for(index=0;index<mCount;index++) {
temp[index]=mEntries[index];
}
delete [] mEntries;
nsTagEntry* temp=new nsTagEntry[mCapacity+=50];
PRUint32 index=0;
for(index=0;index<mCount;index++) {
temp[index]=mEntries[index];
}
delete [] mEntries;
mEntries=temp;
}
mCapacity+=50;
mEntries[mCount].mTag=aTag;
mEntries[mCount].mBankIndex=-1;
mEntries[mCount++].mStyleIndex=-1;

2
mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp
View File

@@ -542,7 +542,7 @@ void nsHTMLContentSinkStream::UnicodeToHTMLString(const nsString& aSrc)
PRInt32 bufferLength = mBufferSize;
mUnicodeEncoder->Reset();
nsresult result = mUnicodeEncoder->Convert(data, &length, mBuffer, &bufferLength);
nsresult result = mUnicodeEncoder->Convert(data.GetUnicode(), &length, mBuffer, &bufferLength);
mBuffer[bufferLength] = 0;
PRInt32 temp = bufferLength;
if (NS_SUCCEEDED(result))

2
mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
View File

@@ -487,7 +487,7 @@ void nsHTMLToTXTSinkStream::UnicodeToTXTString(const nsString& aSrc)
bufferLength = mBufferSize;
mUnicodeEncoder->Reset();
result = mUnicodeEncoder->Convert(aSrc, &length, mBuffer, &bufferLength);
result = mUnicodeEncoder->Convert(aSrc.GetUnicode(), &length, mBuffer, &bufferLength);
mBuffer[bufferLength] = 0;
PRInt32 temp = bufferLength;
if (NS_SUCCEEDED(result))