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

progress towards 108962 - fix nsLinebreakConverter to stop using private nsStr members

Browse Source 
r=dbaron, sr=jag


git-svn-id: svn://10.0.0.236/trunk@111970 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com
2002-01-11 22:40:09 +00:00
parent 18b97b7a4c
commit e6fbcc6ced
1 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
mozilla/xpcom/io/nsLinebreakConverter.cpp
View File

@@ -471,44 +471,22 @@ nsresult nsLinebreakConverter::ConvertStringLineBreaks(nsString& ioString,
// nothing to do
if (ioString.Length() == 0) return NS_OK;
// we can't go messing with data we don't own
if (!ioString.mOwnsBuffer) return NS_ERROR_UNEXPECTED;
nsresult rv;
if (ioString.mCharSize == eTwoByte)
{
PRUnichar *stringBuf = ioString.mUStr;
PRInt32 newLen, theLen = ioString.mLength + 1;
// remember the old buffer in case
// we blow it away later
nsString::char_iterator stringBuf;
ioString.BeginWriting(stringBuf);
PRInt32 newLen;
rv = ConvertUnicharLineBreaksInSitu(&stringBuf, aSrcBreaks, aDestBreaks, theLen, &newLen);
if (NS_FAILED(rv)) return rv;
if (stringBuf != ioString.mUStr) // we reallocated
{
// this is pretty evil. Is there a better way?
nsMemory::Free(ioString.mUStr);
ioString.mUStr = stringBuf;
ioString.mLength = newLen - 1;
ioString.mCapacity = newLen;
}
}
else
{
char *stringBuf = ioString.mStr;
PRInt32 newLen, theLen = ioString.mLength + 1;
rv = ConvertLineBreaksInSitu(&stringBuf, aSrcBreaks, aDestBreaks, theLen, &newLen);
if (NS_FAILED(rv)) return rv;
if (stringBuf != ioString.mStr) // we reallocated
{
nsMemory::Free(ioString.mStr);
ioString.mStr = stringBuf;
ioString.mLength = newLen - 1;
ioString.mCapacity = newLen;
}
}
rv = ConvertUnicharLineBreaksInSitu(&stringBuf,
aSrcBreaks, aDestBreaks,
ioString.Length() + 1, &newLen);
if (NS_FAILED(rv)) return rv;
if (stringBuf != ioString.get())
ioString.Adopt(stringBuf);
return NS_OK;
}