diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index efcee9bb310..aa23d702af2 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -1341,7 +1341,7 @@ JS_InitStandardClasses(JSContext *cx, JSObject *obj) /* Define a top-level property 'undefined' with the undefined value. */ atom = cx->runtime->atomState.typeAtoms[JSTYPE_VOID]; if (!obj->defineProperty(cx, ATOM_TO_JSID(atom), JSVAL_VOID, - JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT, + JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT, NULL)) { return JS_FALSE; } @@ -1548,7 +1548,7 @@ JS_ResolveStandardClass(JSContext *cx, JSObject *obj, jsval id, if (idstr == ATOM_TO_STRING(atom)) { *resolved = JS_TRUE; return obj->defineProperty(cx, ATOM_TO_JSID(atom), JSVAL_VOID, - JS_PropertyStub, JS_PropertyStub, + JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT, NULL); } @@ -1643,7 +1643,7 @@ JS_EnumerateStandardClasses(JSContext *cx, JSObject *obj) atom = rt->atomState.typeAtoms[JSTYPE_VOID]; if (!AlreadyHasOwnProperty(cx, obj, atom) && !obj->defineProperty(cx, ATOM_TO_JSID(atom), JSVAL_VOID, - JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT, + JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT, NULL)) { return JS_FALSE; } @@ -2971,7 +2971,7 @@ DefinePropertyById(JSContext *cx, JSObject *obj, jsid id, jsval value, return !!js_DefineNativeProperty(cx, obj, id, value, getter, setter, attrs, flags, tinyid, NULL); } - return obj->defineProperty(cx, id, value, getter, setter, attrs, NULL); + return obj->defineProperty(cx, id, value, getter, setter, attrs, NULL); } static JSBool diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp index 789dff0cee4..9342f373a54 100644 --- a/js/src/jsinterp.cpp +++ b/js/src/jsinterp.cpp @@ -3021,7 +3021,7 @@ js_Interpret(JSContext *cx) /********************** Here we include the operations ***********************/ #include "jsops.cpp" /*****************************************************************************/ - + #if !JS_THREADED_INTERP default: #endif diff --git a/js/src/json.cpp b/js/src/json.cpp index f0393bbf60b..5bc674f9840 100644 --- a/js/src/json.cpp +++ b/js/src/json.cpp @@ -67,7 +67,7 @@ struct JSONParser { JSONParser(JSContext *cx) - : hexChar(), numHex(), statep(), stateStack(), rootVal(), objectStack(), + : hexChar(), numHex(), statep(), stateStack(), rootVal(), objectStack(), objectKey(cx), buffer(cx) {} @@ -195,7 +195,7 @@ write_string(JSContext *cx, JSCharBuffer &cb, const jschar *buf, uint32 len) } mark = i + 1; } else if (buf[i] <= 31 || buf[i] == 127) { - if (!cb.append(&buf[mark], i - mark) || + if (!cb.append(&buf[mark], i - mark) || !js_AppendLiteral(cb, unicodeEscape)) { return JS_FALSE; } @@ -596,7 +596,7 @@ static JSBool Walk(JSContext *cx, jsid id, JSObject *holder, jsval reviver, jsval *vp) { JS_CHECK_RECURSION(cx, return JS_FALSE); - + if (!holder->getProperty(cx, id, vp)) return JS_FALSE; diff --git a/js/src/jsops.cpp b/js/src/jsops.cpp index 179e967d58e..6c12ef99b7f 100644 --- a/js/src/jsops.cpp +++ b/js/src/jsops.cpp @@ -39,7 +39,7 @@ * ***** END LICENSE BLOCK ***** */ /* This file needs to be included in possibly multiple places. */ - + #if JS_THREADED_INTERP interrupt: #else /* !JS_THREADED_INTERP */ diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp index b8a92cdb3a8..5d83a778322 100644 --- a/js/src/jstracer.cpp +++ b/js/src/jstracer.cpp @@ -401,7 +401,7 @@ InitJITLogController() printf(" abort show trace recording aborts\n"); printf(" stats show trace recording stats\n"); printf(" regexp show compilation & entry for regexps\n"); - printf(" treevis spew that tracevis/tree.py can parse\n"); + printf(" treevis spew that tracevis/tree.py can parse\n"); printf(" ------ options for Nanojit ------\n"); printf(" liveness show LIR liveness at start of rdr pipeline\n"); printf(" readlir show LIR as it enters the reader pipeline\n"); @@ -3734,7 +3734,7 @@ class SlotMap : public SlotVisitorBase checkType(unsigned i, JSTraceType t) { debug_only_printf(LC_TMTracer, - "checkType slot %d: interp=%c typemap=%c isNum=%d promoteInt=%d\n", + "checkType slot %d: interp=%c typemap=%c isNum=%d promoteInt=%d\n", i, typeChar[getCoercedType(*slots[i].v)], typeChar[t], @@ -5852,7 +5852,7 @@ LeaveTree(InterpState& state, VMSideExit* lr) JS_ASSERT(innermost->root()->getTreeInfo()->nGlobalTypes() > innermost->numGlobalSlots); typeMap.ensure(ngslots); #ifdef DEBUG - unsigned check_ngslots = + unsigned check_ngslots = #endif BuildGlobalTypeMapFromInnerTree(typeMap, innermost); JS_ASSERT(check_ngslots == ngslots); @@ -9731,7 +9731,7 @@ TraceRecorder::incName(jsint incr, bool pre) LIns* v_ins; LIns* v_after; NameResult nr; - + CHECK_STATUS(name(vp, v_ins, nr)); CHECK_STATUS(incHelper(*vp, v_ins, v_after, incr)); LIns* v_result = pre ? v_after : v_ins; diff --git a/js/src/jstracer.h b/js/src/jstracer.h index 9fb6b68655f..fd88e871249 100644 --- a/js/src/jstracer.h +++ b/js/src/jstracer.h @@ -740,7 +740,7 @@ class TraceRecorder : public avmplus::GCObject { JS_REQUIRES_STACK JSRecordingStatus inc(jsval& v, jsint incr, bool pre = true); JS_REQUIRES_STACK JSRecordingStatus inc(jsval v, nanojit::LIns*& v_ins, jsint incr, bool pre = true); - JS_REQUIRES_STACK JSRecordingStatus incHelper(jsval v, nanojit::LIns* v_ins, + JS_REQUIRES_STACK JSRecordingStatus incHelper(jsval v, nanojit::LIns* v_ins, nanojit::LIns*& v_after, jsint incr); JS_REQUIRES_STACK JSRecordingStatus incProp(jsint incr, bool pre = true); JS_REQUIRES_STACK JSRecordingStatus incElem(jsint incr, bool pre = true); diff --git a/js/src/jsvector.h b/js/src/jsvector.h index 41f1878bf45..3877be7d7d6 100644 --- a/js/src/jsvector.h +++ b/js/src/jsvector.h @@ -555,7 +555,7 @@ JSTempVector::~JSTempVector() */ template inline bool -JSTempVector::calculateNewCapacity(size_t curSize, size_t sizeInc, +JSTempVector::calculateNewCapacity(size_t curSize, size_t sizeInc, size_t &newCap) { size_t newMinCap = curSize + sizeInc; diff --git a/js/src/jsxml.cpp b/js/src/jsxml.cpp index 6c3bac24e83..9cfd34b0524 100644 --- a/js/src/jsxml.cpp +++ b/js/src/jsxml.cpp @@ -3478,7 +3478,7 @@ retry: } xobj = js_GetXMLObject(cx, kid); vobj = js_GetXMLObject(cx, vkid); - if (!xobj || !vobj || + if (!xobj || !vobj || !js_TestXMLEquality(cx, xobj, OBJECT_TO_JSVAL(vobj), bp)) return JS_FALSE; if (!*bp)