Merge MC -> JM.

This commit is contained in:
Brian Hackett
2011-07-28 18:10:31 -07:00
1127 changed files with 251667 additions and 15562 deletions

View File

@@ -363,7 +363,7 @@ ParseIntStringHelper(JSContext *cx, const jschar *ws, const jschar *end, int may
JS_ASSERT(maybeRadix == 0 || (2 <= maybeRadix && maybeRadix <= 36));
JS_ASSERT(ws <= end);
const jschar *s = js_SkipWhiteSpace(ws, end);
const jschar *s = SkipSpace(ws, end);
JS_ASSERT(ws <= s);
JS_ASSERT(s <= end);
@@ -1453,15 +1453,14 @@ JSBool
js_strtod(JSContext *cx, const jschar *s, const jschar *send,
const jschar **ep, jsdouble *dp)
{
const jschar *s1;
size_t length, i;
size_t i;
char cbuf[32];
char *cstr, *istr, *estr;
JSBool negative;
jsdouble d;
s1 = js_SkipWhiteSpace(s, send);
length = send - s1;
const jschar *s1 = SkipSpace(s, send);
size_t length = send - s1;
/* Use cbuf to avoid malloc */
if (length >= sizeof cbuf) {