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

fixed bug in Compare() and error in ToInteger()

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@17465 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rickg%netscape.com 1999-01-10 08:17:40 +00:00
parent f7f7d95b74
commit f8fb00ca59
4 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/base/src/nsString.cpp
View File

@ -623,7 +623,8 @@ float nsString::ToFloat(PRInt32* aErrorCode) const
*/
PRInt32 nsString::ToInteger(PRInt32* aErrorCode,PRInt32 aRadix) const {
PRInt32 result = 0;
PRUnichar* cp = mStr + mLength-1;
PRInt32 decPt=Find(PRUnichar('.'),0);
PRUnichar* cp = (-1==decPt) ? mStr + mLength-1 : mStr+decPt-1;
char digit=0;
PRUnichar theChar;
PRInt32 theShift=0;
@ -631,6 +632,7 @@ PRInt32 nsString::ToInteger(PRInt32* aErrorCode,PRInt32 aRadix) const {
*aErrorCode = (0<mLength) ? NS_OK : NS_ERROR_ILLEGAL_VALUE;
// Skip trailing non-numeric...
while (cp >= mStr) {
theChar = *cp;
@ -1635,9 +1637,9 @@ PRInt32 nsString::Compare(const nsString &S,PRBool aIgnoreCase) const {
return 1;
}
if (aIgnoreCase) {
return nsCRT::strncasecmp(mStr,S.mStr,maxlen);
return nsCRT::strcasecmp(mStr,S.mStr);
}
return nsCRT::strncmp(mStr,S.mStr,maxlen);
return nsCRT::strcmp(mStr,S.mStr);
}
/**
@ -2060,6 +2062,15 @@ NS_BASE int fputs(const nsString& aString, FILE* out)
* @return
*/
void nsString::SelfTest(void) {
nsAutoString a("foobar");
nsAutoString b("foo");
nsAutoString c(".5111");
PRInt32 result=a.Compare(b);
PRInt32 result2=result;
result=c.ToInteger(&result2);
result2=result;
#if 0
static const char* kConstructorError = kConstructorError;

17
mozilla/string/obsolete/nsString.cpp
View File

@ -623,7 +623,8 @@ float nsString::ToFloat(PRInt32* aErrorCode) const
*/
PRInt32 nsString::ToInteger(PRInt32* aErrorCode,PRInt32 aRadix) const {
PRInt32 result = 0;
PRUnichar* cp = mStr + mLength-1;
PRInt32 decPt=Find(PRUnichar('.'),0);
PRUnichar* cp = (-1==decPt) ? mStr + mLength-1 : mStr+decPt-1;
char digit=0;
PRUnichar theChar;
PRInt32 theShift=0;
@ -631,6 +632,7 @@ PRInt32 nsString::ToInteger(PRInt32* aErrorCode,PRInt32 aRadix) const {
*aErrorCode = (0<mLength) ? NS_OK : NS_ERROR_ILLEGAL_VALUE;
// Skip trailing non-numeric...
while (cp >= mStr) {
theChar = *cp;
@ -1635,9 +1637,9 @@ PRInt32 nsString::Compare(const nsString &S,PRBool aIgnoreCase) const {
return 1;
}
if (aIgnoreCase) {
return nsCRT::strncasecmp(mStr,S.mStr,maxlen);
return nsCRT::strcasecmp(mStr,S.mStr);
}
return nsCRT::strncmp(mStr,S.mStr,maxlen);
return nsCRT::strcmp(mStr,S.mStr);
}
/**
@ -2060,6 +2062,15 @@ NS_BASE int fputs(const nsString& aString, FILE* out)
* @return
*/
void nsString::SelfTest(void) {
nsAutoString a("foobar");
nsAutoString b("foo");
nsAutoString c(".5111");
PRInt32 result=a.Compare(b);
PRInt32 result2=result;
result=c.ToInteger(&result2);
result2=result;
#if 0
static const char* kConstructorError = kConstructorError;

17
mozilla/xpcom/ds/nsString.cpp
View File

@ -623,7 +623,8 @@ float nsString::ToFloat(PRInt32* aErrorCode) const
*/
PRInt32 nsString::ToInteger(PRInt32* aErrorCode,PRInt32 aRadix) const {
PRInt32 result = 0;
PRUnichar* cp = mStr + mLength-1;
PRInt32 decPt=Find(PRUnichar('.'),0);
PRUnichar* cp = (-1==decPt) ? mStr + mLength-1 : mStr+decPt-1;
char digit=0;
PRUnichar theChar;
PRInt32 theShift=0;
@ -631,6 +632,7 @@ PRInt32 nsString::ToInteger(PRInt32* aErrorCode,PRInt32 aRadix) const {
*aErrorCode = (0<mLength) ? NS_OK : NS_ERROR_ILLEGAL_VALUE;
// Skip trailing non-numeric...
while (cp >= mStr) {
theChar = *cp;
@ -1635,9 +1637,9 @@ PRInt32 nsString::Compare(const nsString &S,PRBool aIgnoreCase) const {
return 1;
}
if (aIgnoreCase) {
return nsCRT::strncasecmp(mStr,S.mStr,maxlen);
return nsCRT::strcasecmp(mStr,S.mStr);
}
return nsCRT::strncmp(mStr,S.mStr,maxlen);
return nsCRT::strcmp(mStr,S.mStr);
}
/**
@ -2060,6 +2062,15 @@ NS_BASE int fputs(const nsString& aString, FILE* out)
* @return
*/
void nsString::SelfTest(void) {
nsAutoString a("foobar");
nsAutoString b("foo");
nsAutoString c(".5111");
PRInt32 result=a.Compare(b);
PRInt32 result2=result;
result=c.ToInteger(&result2);
result2=result;
#if 0
static const char* kConstructorError = kConstructorError;

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

@ -623,7 +623,8 @@ float nsString::ToFloat(PRInt32* aErrorCode) const
*/
PRInt32 nsString::ToInteger(PRInt32* aErrorCode,PRInt32 aRadix) const {
PRInt32 result = 0;
PRUnichar* cp = mStr + mLength-1;
PRInt32 decPt=Find(PRUnichar('.'),0);
PRUnichar* cp = (-1==decPt) ? mStr + mLength-1 : mStr+decPt-1;
char digit=0;
PRUnichar theChar;
PRInt32 theShift=0;
@ -631,6 +632,7 @@ PRInt32 nsString::ToInteger(PRInt32* aErrorCode,PRInt32 aRadix) const {
*aErrorCode = (0<mLength) ? NS_OK : NS_ERROR_ILLEGAL_VALUE;
// Skip trailing non-numeric...
while (cp >= mStr) {
theChar = *cp;
@ -1635,9 +1637,9 @@ PRInt32 nsString::Compare(const nsString &S,PRBool aIgnoreCase) const {
return 1;
}
if (aIgnoreCase) {
return nsCRT::strncasecmp(mStr,S.mStr,maxlen);
return nsCRT::strcasecmp(mStr,S.mStr);
}
return nsCRT::strncmp(mStr,S.mStr,maxlen);
return nsCRT::strcmp(mStr,S.mStr);
}
/**
@ -2060,6 +2062,15 @@ NS_BASE int fputs(const nsString& aString, FILE* out)
* @return
*/
void nsString::SelfTest(void) {
nsAutoString a("foobar");
nsAutoString b("foo");
nsAutoString c(".5111");
PRInt32 result=a.Compare(b);
PRInt32 result2=result;
result=c.ToInteger(&result2);
result2=result;
#if 0
static const char* kConstructorError = kConstructorError;