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

Fixes mozilla/strings requiring unfrozen nsCRT class. patch by scc, r=dougt, sr=jag, b=136756

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@121534 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%netscape.com
2002-05-15 18:55:21 +00:00
parent a00f9461f3
commit d6cc711878
224 changed files with 558 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mozilla/xpcom/string/obsolete/nsString2.cpp
View File

@@ -44,13 +44,15 @@
#include "nsString.h"
#include "nsReadableUtils.h"
#include "nsDebug.h"
#include "nsDeque.h"
#ifndef nsCharTraits_h___
#include "nsCharTraits.h"
#endif
#ifndef RICKG_TESTBED
#include "prdtoa.h"
#include "nsISizeOfHandler.h"
#endif
#endif
static const char* kPossibleNull = "Error: possible unintended null in string";
static const char* kNullPointerError = "Error: unexpected null ptr";
@@ -372,12 +374,12 @@ void
nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* aNewValue){
if(aTarget && aNewValue) {
PRInt32 len=nsCRT::strlen(aTarget);
PRInt32 len=nsCharTraits<PRUnichar>::length(aTarget);
if(0<len) {
CBufDescriptor theDesc1(aTarget,PR_TRUE, len+1,len);
nsAutoString theTarget(theDesc1);
len=nsCRT::strlen(aNewValue);
len=nsCharTraits<PRUnichar>::length(aNewValue);
if(0<len) {
CBufDescriptor theDesc2(aNewValue,PR_TRUE, len+1,len);
nsAutoString theNewValue(theDesc2);
@@ -719,7 +721,7 @@ void nsString::AppendWithConversion(const char* aCString,PRInt32 aCount) {
#endif
}
else aCount=temp.mLength=strlen(aCString);
else aCount=temp.mLength=nsCharTraits<char>::length(aCString);
if(0<aCount)
nsStrPrivate::StrAppend(*this,temp,0,aCount);
@@ -811,7 +813,7 @@ void nsString::InsertWithConversion(const char* aCString,PRUint32 anOffset,PRInt
#endif
}
else aCount=temp.mLength=strlen(aCString);
else aCount=temp.mLength=nsCharTraits<char>::length(aCString);
if(0<aCount){
nsStrPrivate::StrInsert1into2(*this,anOffset,temp,0,aCount);
@@ -863,7 +865,7 @@ PRInt32 nsString::Find(const char* aCString,PRBool aIgnoreCase,PRInt32 anOffset,
if(aCString) {
nsStr temp;
nsStrPrivate::Initialize(temp,eOneByte);
temp.mLength=strlen(aCString);
temp.mLength=nsCharTraits<char>::length(aCString);
temp.mStr = NS_CONST_CAST(char*, aCString);
result=nsStrPrivate::FindSubstr1in2(*this,temp,aIgnoreCase,anOffset,aCount);
}
@@ -887,7 +889,7 @@ PRInt32 nsString::Find(const PRUnichar* aString,PRInt32 anOffset,PRInt32 aCount)
if(aString) {
nsStr temp;
nsStrPrivate::Initialize(temp,eTwoByte);
temp.mLength = nsCRT::strlen(aString);
temp.mLength = nsCharTraits<PRUnichar>::length(aString);
temp.mUStr = NS_CONST_CAST(PRUnichar*, aString);
result=nsStrPrivate::FindSubstr2in2(*this,temp,anOffset,aCount);
}
@@ -931,7 +933,7 @@ PRInt32 nsString::FindCharInSet(const char* aCStringSet,PRInt32 anOffset) const{
if(aCStringSet) {
nsStr temp;
nsStrPrivate::Initialize(temp,eOneByte);
temp.mLength=strlen(aCStringSet);
temp.mLength=nsCharTraits<char>::length(aCStringSet);
temp.mStr = NS_CONST_CAST(char*, aCStringSet);
result=nsStrPrivate::FindCharInSet1(*this,temp,PR_FALSE,anOffset);
}
@@ -954,7 +956,7 @@ PRInt32 nsString::FindCharInSet(const PRUnichar* aStringSet,PRInt32 anOffset) co
if(aStringSet) {
nsStr temp;
nsStrPrivate::Initialize(temp,eTwoByte);
temp.mLength=nsCRT::strlen(aStringSet);
temp.mLength=nsCharTraits<PRUnichar>::length(aStringSet);
temp.mUStr=NS_CONST_CAST(PRUnichar*, aStringSet);
result=nsStrPrivate::FindCharInSet2(*this,temp,anOffset);
}
@@ -987,7 +989,7 @@ PRInt32 nsString::RFind(const PRUnichar* aString, PRInt32 anOffset, PRInt32 aCou
if (aString) {
nsStr temp;
nsStrPrivate::Initialize(temp, eTwoByte);
temp.mLength = nsCRT::strlen(aString);
temp.mLength = nsCharTraits<PRUnichar>::length(aString);
temp.mUStr = NS_CONST_CAST(PRUnichar*, aString);
result=nsStrPrivate::RFindSubstr2in2(*this,temp,anOffset,aCount);
}
@@ -1011,7 +1013,7 @@ PRInt32 nsString::RFind(const char* aString,PRBool aIgnoreCase,PRInt32 anOffset,
if(aString) {
nsStr temp;
nsStrPrivate::Initialize(temp,eOneByte);
temp.mLength=strlen(aString);
temp.mLength=nsCharTraits<char>::length(aString);
temp.mStr = NS_CONST_CAST(char*, aString);
result=nsStrPrivate::RFindSubstr1in2(*this,temp,aIgnoreCase,anOffset,aCount);
}
@@ -1049,7 +1051,7 @@ PRInt32 nsString::RFindCharInSet(const PRUnichar* aStringSet,PRInt32 anOffset) c
if(aStringSet) {
nsStr temp;
nsStrPrivate::Initialize(temp,eTwoByte);
temp.mLength = nsCRT::strlen(aStringSet);
temp.mLength = nsCharTraits<PRUnichar>::length(aStringSet);
temp.mUStr = NS_CONST_CAST(PRUnichar*, aStringSet);
result=nsStrPrivate::RFindCharInSet2(*this,temp,anOffset);
}
@@ -1076,7 +1078,7 @@ PRInt32 nsString::CompareWithConversion(const char *aCString,PRBool aIgnoreCase,
nsStr temp;
nsStrPrivate::Initialize(temp,eOneByte);
temp.mLength= (0<aCount) ? aCount : strlen(aCString);
temp.mLength= (0<aCount) ? aCount : nsCharTraits<char>::length(aCString);
temp.mStr = NS_CONST_CAST(char*, aCString);
return nsStrPrivate::StrCompare2To1(*this,temp,aCount,aIgnoreCase);
@@ -1123,7 +1125,7 @@ PRBool nsString::EqualsAtom(nsIAtom* aAtom) const{
const PRUnichar* unicode;
if (aAtom->GetUnicode(&unicode) != NS_OK || unicode == nsnull)
return PR_FALSE;
cmp=Compare2To2(mUStr,unicode, nsCRT::strlen(mUStr));
cmp=Compare2To2(mUStr,unicode, nsCharTraits<PRUnichar>::length(mUStr));
result=PRBool(0==cmp);
}