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

Bug 165877 - ToFloat never reported when the string wasn't a legal float. Also switch to strtod for a small performance win. r=jaggernaut@netscape.com, sr=alecf@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@134608 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bratell%lysator.liu.se
2002-12-02 09:30:59 +00:00
parent 7ad05b4517
commit 7491cb486a
4 changed files with 60 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -464,19 +464,24 @@ nsCString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailin
* @return float rep of string value
*/
float nsCString::ToFloat(PRInt32* aErrorCode) const {
char buf[100];
if (mLength > PRInt32(sizeof(buf)-1)) {
*aErrorCode = (PRInt32) NS_ERROR_ILLEGAL_VALUE;
return 0.0f;
float res = 0.0f;
if (mLength > 0) {
char *conv_stopped;
const char *str = get();
res = (float)strtod(str, &conv_stopped);
if (conv_stopped == str+mLength) {
*aErrorCode = (PRInt32) NS_OK;
}
else {
/* Not all the string was scanned */
*aErrorCode = (PRInt32) NS_ERROR_ILLEGAL_VALUE;
}
}
char *cp = strncpy(buf, get(), sizeof(buf) - 1);
buf[sizeof(buf)-1] = '\0';
float f = (float) PR_strtod(cp, &cp);
if (*cp != 0) {
else {
/* The string was too short (0 characters) */
*aErrorCode = (PRInt32) NS_ERROR_ILLEGAL_VALUE;
}
*aErrorCode = (PRInt32) NS_OK;
return f;
return res;
}
/**