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

Added a macro and normalized auto-string initialization; reordered methods slightly just to annoy rickg :-)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@9440 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1998-09-05 23:21:42 +00:00
parent cb74fa0564
commit f9c2c2bcd2
4 changed files with 148 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
mozilla/xpcom/string/obsolete/nsString.cpp
View File

@@ -1752,6 +1752,11 @@ ostream& operator<<(ostream& os,nsString& aString){
//----------------------------------------------------------------------
#define INIT_AUTO_STRING() \
mLength = 0; \
mCapacity = (sizeof(mBuf) / sizeof(chartype))-sizeof(chartype); \
mStr = mBuf
/**
*
* @update gess 7/27/98
@@ -1761,9 +1766,7 @@ ostream& operator<<(ostream& os,nsString& aString){
nsAutoString::nsAutoString()
: nsString()
{
mStr = mBuf;
mLength=0;
mCapacity = (sizeof(mBuf) / sizeof(chartype))-sizeof(chartype);
INIT_AUTO_STRING();
mStr[0] = 0;
}
@@ -1776,9 +1779,7 @@ nsAutoString::nsAutoString()
nsAutoString::nsAutoString(const char* isolatin1)
: nsString()
{
mLength=0;
mCapacity = (sizeof(mBuf) / sizeof(chartype))-sizeof(chartype);
mStr=mBuf;
INIT_AUTO_STRING();
SetString(isolatin1);
}
@@ -1791,9 +1792,7 @@ nsAutoString::nsAutoString(const char* isolatin1)
nsAutoString::nsAutoString(const nsString& other)
: nsString()
{
mLength=0;
mCapacity = (sizeof(mBuf) / sizeof(chartype))-sizeof(chartype);
mStr=mBuf;
INIT_AUTO_STRING();
SetString(other.GetUnicode(),other.Length());
}
@@ -1806,9 +1805,7 @@ nsAutoString::nsAutoString(const nsString& other)
nsAutoString::nsAutoString(PRUnichar aChar)
: nsString()
{
mLength=0;
mCapacity = (sizeof(mBuf) / sizeof(chartype))-sizeof(chartype);
mStr=mBuf;
INIT_AUTO_STRING();
Append(aChar);
}
@@ -1821,12 +1818,37 @@ nsAutoString::nsAutoString(PRUnichar aChar)
nsAutoString::nsAutoString(const nsAutoString& other)
: nsString()
{
mLength=0;
mCapacity = (sizeof(mBuf) / sizeof(chartype))-sizeof(chartype);
mStr=mBuf;
INIT_AUTO_STRING();
SetString(other.GetUnicode(),other.mLength);
}
/**
*
* @update gess 7/27/98
* @param
* @return
*/
nsAutoString::nsAutoString(const PRUnichar* unicode, PRInt32 uslen)
: nsString()
{
INIT_AUTO_STRING();
Append(unicode, uslen ? uslen : nsCRT::strlen(unicode));
}
/**
*
* @update gess 7/27/98
* @param
* @return
*/
nsAutoString::~nsAutoString()
{
if (mStr == mBuf) {
// Force to null so that baseclass dtor doesn't do damage
mStr = nsnull;
}
}
/**
* nsAutoString's buffer growing routine uses a different algorithm
* than nsString because the lifetime of the auto string is assumed
@@ -1852,37 +1874,6 @@ void nsAutoString::EnsureCapacityFor(PRInt32 aNewLength) {
}
}
/**
*
* @update gess 7/27/98
* @param
* @return
*/
nsAutoString::nsAutoString(const PRUnichar* unicode, PRInt32 uslen)
: nsString()
{
mStr = mBuf;
mCapacity = sizeof(mBuf) / sizeof(chartype);
if (0 == uslen) {
uslen = nsCRT::strlen(unicode);
}
Append(unicode, uslen);
}
/**
*
* @update gess 7/27/98
* @param
* @return
*/
nsAutoString::~nsAutoString()
{
if (mStr == mBuf) {
// Force to null so that baseclass dtor doesn't do damage
mStr = nsnull;
}
}
void
nsAutoString::SizeOf(nsISizeOfHandler* aHandler) const
{