diff --git a/src/ecmascript/spidermonkey/document.cpp b/src/ecmascript/spidermonkey/document.cpp index 59114c93..0b9108ba 100644 --- a/src/ecmascript/spidermonkey/document.cpp +++ b/src/ecmascript/spidermonkey/document.cpp @@ -1327,7 +1327,7 @@ document_write_do(JSContext *ctx, unsigned int argc, JS::Value *rval, int newlin add_string_to_string(&interpreter->current_writecode->string, &string); done_string(&string); } else { - struct string *ret = add_to_ecmascript_string_list(&interpreter->writecode, string.source, string.length, element_offset); + (void)add_to_ecmascript_string_list(&interpreter->writecode, string.source, string.length, element_offset); done_string(&string); interpreter->current_writecode = interpreter->current_writecode->next; } diff --git a/src/ecmascript/spidermonkey/element.cpp b/src/ecmascript/spidermonkey/element.cpp index a95b975d..bce3e011 100644 --- a/src/ecmascript/spidermonkey/element.cpp +++ b/src/ecmascript/spidermonkey/element.cpp @@ -2425,8 +2425,6 @@ element_addEventListener(JSContext *ctx, unsigned int argc, JS::Value *rval) JS::CallArgs args = CallArgsFromVp(argc, rval); JS::RootedObject hobj(ctx, &args.thisv().toObject()); - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); - if (!JS_InstanceOf(ctx, hobj, &element_class, NULL)) { #ifdef ECMASCRIPT_DEBUG fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__); @@ -2490,8 +2488,6 @@ element_removeEventListener(JSContext *ctx, unsigned int argc, JS::Value *rval) JS::CallArgs args = CallArgsFromVp(argc, rval); JS::RootedObject hobj(ctx, &args.thisv().toObject()); - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); - if (!JS_InstanceOf(ctx, hobj, &element_class, NULL)) { #ifdef ECMASCRIPT_DEBUG fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__); diff --git a/src/ecmascript/spidermonkey/keyboard.cpp b/src/ecmascript/spidermonkey/keyboard.cpp index f658a580..9182078c 100644 --- a/src/ecmascript/spidermonkey/keyboard.cpp +++ b/src/ecmascript/spidermonkey/keyboard.cpp @@ -116,8 +116,6 @@ keyboardEvent_constructor(JSContext* ctx, unsigned argc, JS::Value* vp) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); - if (!newObj) { return false; } @@ -155,7 +153,6 @@ keyboardEvent_get_property_key(JSContext *ctx, unsigned int argc, JS::Value *vp) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct keyboard *keyb = JS::GetMaybePtrFromReservedSlot(hobj, 0); if (!keyb) { @@ -185,7 +182,6 @@ keyboardEvent_get_property_keyCode(JSContext *ctx, unsigned int argc, JS::Value #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct keyboard *keyb = JS::GetMaybePtrFromReservedSlot(hobj, 0); if (!keyb) { diff --git a/src/ecmascript/spidermonkey/message.cpp b/src/ecmascript/spidermonkey/message.cpp index 45c9fc67..5830f723 100644 --- a/src/ecmascript/spidermonkey/message.cpp +++ b/src/ecmascript/spidermonkey/message.cpp @@ -123,8 +123,6 @@ messageEvent_constructor(JSContext* ctx, unsigned argc, JS::Value* vp) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); - if (!newObj) { return false; } @@ -163,7 +161,6 @@ messageEvent_get_property_data(JSContext *ctx, unsigned int argc, JS::Value *vp) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct message_event *event = JS::GetMaybePtrFromReservedSlot(hobj, 0); if (!event) { @@ -195,7 +192,6 @@ messageEvent_get_property_lastEventId(JSContext *ctx, unsigned int argc, JS::Val #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct message_event *event = JS::GetMaybePtrFromReservedSlot(hobj, 0); if (!event) { @@ -227,7 +223,6 @@ messageEvent_get_property_origin(JSContext *ctx, unsigned int argc, JS::Value *v #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct message_event *event = JS::GetMaybePtrFromReservedSlot(hobj, 0); if (!event) { @@ -259,7 +254,6 @@ messageEvent_get_property_source(JSContext *ctx, unsigned int argc, JS::Value *v #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct message_event *event = JS::GetMaybePtrFromReservedSlot(hobj, 0); if (!event) { @@ -301,7 +295,7 @@ get_messageEvent(JSContext *ctx, char *data, char *origin, char *source) char id[32]; - snprintf(id, "%d", 31, ++lastEventId); + snprintf(id, 31, "%d", ++lastEventId); event->lastEventId = stracpy(id); JS::SetReservedSlot(e, 0, JS::PrivateValue(event)); diff --git a/src/ecmascript/spidermonkey/window.cpp b/src/ecmascript/spidermonkey/window.cpp index b11bda4c..c4a096b1 100644 --- a/src/ecmascript/spidermonkey/window.cpp +++ b/src/ecmascript/spidermonkey/window.cpp @@ -305,7 +305,6 @@ window_removeEventListener(JSContext *ctx, unsigned int argc, JS::Value *rval) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct el_window *elwin = JS::GetMaybePtrFromReservedSlot(hobj, 0); if (argc < 2) { @@ -355,7 +354,6 @@ window_postMessage(JSContext *ctx, unsigned int argc, JS::Value *rval) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct el_window *elwin = JS::GetMaybePtrFromReservedSlot(hobj, 0); if (argc < 2) { @@ -631,8 +629,6 @@ window_clearTimeout(JSContext *ctx, unsigned int argc, JS::Value *rval) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); - JS::CallArgs args = JS::CallArgsFromVp(argc, rval); if (argc != 1) { diff --git a/src/ecmascript/spidermonkey/xhr.cpp b/src/ecmascript/spidermonkey/xhr.cpp index 02940d71..643c4400 100644 --- a/src/ecmascript/spidermonkey/xhr.cpp +++ b/src/ecmascript/spidermonkey/xhr.cpp @@ -373,7 +373,6 @@ xhr_abort(JSContext *ctx, unsigned int argc, JS::Value *rval) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct xhr *xhr = JS::GetMaybePtrFromReservedSlot(hobj, 0); if (xhr && xhr->download.conn) { @@ -400,7 +399,6 @@ xhr_addEventListener(JSContext *ctx, unsigned int argc, JS::Value *rval) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct xhr *xhr = JS::GetMaybePtrFromReservedSlot(hobj, 0); if (argc < 2) { @@ -449,7 +447,6 @@ xhr_removeEventListener(JSContext *ctx, unsigned int argc, JS::Value *rval) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct xhr *xhr = JS::GetMaybePtrFromReservedSlot(hobj, 0); if (argc < 2) { @@ -499,9 +496,7 @@ xhr_getAllResponseHeaders(JSContext *ctx, unsigned int argc, JS::Value *rval) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct xhr *xhr = JS::GetMaybePtrFromReservedSlot(hobj, 0); - struct view_state *vs = interpreter->vs; if (!xhr) { return false; @@ -531,9 +526,7 @@ xhr_getResponseHeader(JSContext *ctx, unsigned int argc, JS::Value *rval) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct xhr *xhr = JS::GetMaybePtrFromReservedSlot(hobj, 0); - struct view_state *vs = interpreter->vs; if (!xhr || argc == 0) { return false; @@ -1122,12 +1115,7 @@ xhr_setRequestHeader(JSContext *ctx, unsigned int argc, JS::Value *rval) #endif return false; } - struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp); struct xhr *xhr = JS::GetMaybePtrFromReservedSlot(hobj, 0); - struct view_state *vs; - struct document_view *doc_view; - vs = interpreter->vs; - doc_view = vs->doc_view; if (!xhr) { return false;