mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

This commit is contained in:
bratell%lysator.liu.se 2002-12-02 09:30:59 +00:00
Родитель 0362da69ed
Коммит 4910d76401
4 изменённых файлов: 60 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

25
string/obsolete/nsString.cpp
Просмотреть файл

@ -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;
}
/**

23
string/obsolete/nsString2.cpp
Просмотреть файл

@ -536,18 +536,25 @@ char* nsString::ToCString(char* aBuf, PRUint32 aBufLength,PRUint32 anOffset) con
* @return float rep of string value
*/
float nsString::ToFloat(PRInt32* aErrorCode) const {
float res = 0.0f;
char buf[100];
if (mLength > PRInt32(sizeof(buf)-1)) {
*aErrorCode = (PRInt32) NS_ERROR_ILLEGAL_VALUE;
return 0.0f;
if (mLength > 0 && mLength < sizeof(buf)) {
char *conv_stopped;
const char *str = ToCString(buf, sizeof(buf));
res = (float)strtod(str, &conv_stopped);
if (*conv_stopped == '\0') {
*aErrorCode = (PRInt32) NS_OK;
}
else {
/* Not all the string was scanned */
*aErrorCode = (PRInt32) NS_ERROR_ILLEGAL_VALUE;
}
}
char* cp = ToCString(buf, sizeof(buf));
float f = (float) PR_strtod(cp, &cp);
if (*cp != 0) {
else {
/* The string was too short (0 characters) or too long (sizeof(buf)) */
*aErrorCode = (PRInt32) NS_ERROR_ILLEGAL_VALUE;
}
*aErrorCode = (PRInt32) NS_OK;
return f;
return res;
}

25
xpcom/string/obsolete/nsString.cpp
Просмотреть файл

@ -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;
}
/**

23
xpcom/string/obsolete/nsString2.cpp
Просмотреть файл

@ -536,18 +536,25 @@ char* nsString::ToCString(char* aBuf, PRUint32 aBufLength,PRUint32 anOffset) con
* @return float rep of string value
*/
float nsString::ToFloat(PRInt32* aErrorCode) const {
float res = 0.0f;
char buf[100];
if (mLength > PRInt32(sizeof(buf)-1)) {
*aErrorCode = (PRInt32) NS_ERROR_ILLEGAL_VALUE;
return 0.0f;
if (mLength > 0 && mLength < sizeof(buf)) {
char *conv_stopped;
const char *str = ToCString(buf, sizeof(buf));
res = (float)strtod(str, &conv_stopped);
if (*conv_stopped == '\0') {
*aErrorCode = (PRInt32) NS_OK;
}
else {
/* Not all the string was scanned */
*aErrorCode = (PRInt32) NS_ERROR_ILLEGAL_VALUE;
}
}
char* cp = ToCString(buf, sizeof(buf));
float f = (float) PR_strtod(cp, &cp);
if (*cp != 0) {
else {
/* The string was too short (0 characters) or too long (sizeof(buf)) */
*aErrorCode = (PRInt32) NS_ERROR_ILLEGAL_VALUE;
}
*aErrorCode = (PRInt32) NS_OK;
return f;
return res;
}