aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-10-01 03:36:26 -04:00
Code

[spidermonkey] compilation fixes

Browse Source
This commit is contained in:
Witold Filipczyk 2023-01-28 09:56:48 +01:00
parent 0e70bfb468
commit 9d3af259ad
6 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ecmascript/spidermonkey/document.cpp
View File

@ -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); add_string_to_string(&interpreter->current_writecode->string, &string);
done_string(&string); done_string(&string);
} else { } 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); done_string(&string);
interpreter->current_writecode = interpreter->current_writecode->next; interpreter->current_writecode = interpreter->current_writecode->next;
} }

4
src/ecmascript/spidermonkey/element.cpp
View File

@ -2425,8 +2425,6 @@ element_addEventListener(JSContext *ctx, unsigned int argc, JS::Value *rval)
JS::CallArgs args = CallArgsFromVp(argc, rval); JS::CallArgs args = CallArgsFromVp(argc, rval);
JS::RootedObject hobj(ctx, &args.thisv().toObject()); 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)) { if (!JS_InstanceOf(ctx, hobj, &element_class, NULL)) {
#ifdef ECMASCRIPT_DEBUG #ifdef ECMASCRIPT_DEBUG
fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__); 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::CallArgs args = CallArgsFromVp(argc, rval);
JS::RootedObject hobj(ctx, &args.thisv().toObject()); 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)) { if (!JS_InstanceOf(ctx, hobj, &element_class, NULL)) {
#ifdef ECMASCRIPT_DEBUG #ifdef ECMASCRIPT_DEBUG
fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__); fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);

4
src/ecmascript/spidermonkey/keyboard.cpp
View File

@ -116,8 +116,6 @@ keyboardEvent_constructor(JSContext* ctx, unsigned argc, JS::Value* vp)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
if (!newObj) { if (!newObj) {
return false; return false;
} }
@ -155,7 +153,6 @@ keyboardEvent_get_property_key(JSContext *ctx, unsigned int argc, JS::Value *vp)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct keyboard *keyb = JS::GetMaybePtrFromReservedSlot<struct keyboard>(hobj, 0); struct keyboard *keyb = JS::GetMaybePtrFromReservedSlot<struct keyboard>(hobj, 0);
if (!keyb) { if (!keyb) {
@ -185,7 +182,6 @@ keyboardEvent_get_property_keyCode(JSContext *ctx, unsigned int argc, JS::Value
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct keyboard *keyb = JS::GetMaybePtrFromReservedSlot<struct keyboard>(hobj, 0); struct keyboard *keyb = JS::GetMaybePtrFromReservedSlot<struct keyboard>(hobj, 0);
if (!keyb) { if (!keyb) {

8
src/ecmascript/spidermonkey/message.cpp
View File

@ -123,8 +123,6 @@ messageEvent_constructor(JSContext* ctx, unsigned argc, JS::Value* vp)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
if (!newObj) { if (!newObj) {
return false; return false;
} }
@ -163,7 +161,6 @@ messageEvent_get_property_data(JSContext *ctx, unsigned int argc, JS::Value *vp)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct message_event *event = JS::GetMaybePtrFromReservedSlot<struct message_event>(hobj, 0); struct message_event *event = JS::GetMaybePtrFromReservedSlot<struct message_event>(hobj, 0);
if (!event) { if (!event) {
@ -195,7 +192,6 @@ messageEvent_get_property_lastEventId(JSContext *ctx, unsigned int argc, JS::Val
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct message_event *event = JS::GetMaybePtrFromReservedSlot<struct message_event>(hobj, 0); struct message_event *event = JS::GetMaybePtrFromReservedSlot<struct message_event>(hobj, 0);
if (!event) { if (!event) {
@ -227,7 +223,6 @@ messageEvent_get_property_origin(JSContext *ctx, unsigned int argc, JS::Value *v
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct message_event *event = JS::GetMaybePtrFromReservedSlot<struct message_event>(hobj, 0); struct message_event *event = JS::GetMaybePtrFromReservedSlot<struct message_event>(hobj, 0);
if (!event) { if (!event) {
@ -259,7 +254,6 @@ messageEvent_get_property_source(JSContext *ctx, unsigned int argc, JS::Value *v
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct message_event *event = JS::GetMaybePtrFromReservedSlot<struct message_event>(hobj, 0); struct message_event *event = JS::GetMaybePtrFromReservedSlot<struct message_event>(hobj, 0);
if (!event) { if (!event) {
@ -301,7 +295,7 @@ get_messageEvent(JSContext *ctx, char *data, char *origin, char *source)
char id[32]; char id[32];
snprintf(id, "%d", 31, ++lastEventId); snprintf(id, 31, "%d", ++lastEventId);
event->lastEventId = stracpy(id); event->lastEventId = stracpy(id);
JS::SetReservedSlot(e, 0, JS::PrivateValue(event)); JS::SetReservedSlot(e, 0, JS::PrivateValue(event));

4
src/ecmascript/spidermonkey/window.cpp
View File

@ -305,7 +305,6 @@ window_removeEventListener(JSContext *ctx, unsigned int argc, JS::Value *rval)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct el_window *elwin = JS::GetMaybePtrFromReservedSlot<struct el_window>(hobj, 0); struct el_window *elwin = JS::GetMaybePtrFromReservedSlot<struct el_window>(hobj, 0);
if (argc < 2) { if (argc < 2) {
@ -355,7 +354,6 @@ window_postMessage(JSContext *ctx, unsigned int argc, JS::Value *rval)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct el_window *elwin = JS::GetMaybePtrFromReservedSlot<struct el_window>(hobj, 0); struct el_window *elwin = JS::GetMaybePtrFromReservedSlot<struct el_window>(hobj, 0);
if (argc < 2) { if (argc < 2) {
@ -631,8 +629,6 @@ window_clearTimeout(JSContext *ctx, unsigned int argc, JS::Value *rval)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
JS::CallArgs args = JS::CallArgsFromVp(argc, rval); JS::CallArgs args = JS::CallArgsFromVp(argc, rval);
if (argc != 1) { if (argc != 1) {

12
src/ecmascript/spidermonkey/xhr.cpp
View File

@ -373,7 +373,6 @@ xhr_abort(JSContext *ctx, unsigned int argc, JS::Value *rval)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct xhr *xhr = JS::GetMaybePtrFromReservedSlot<struct xhr>(hobj, 0); struct xhr *xhr = JS::GetMaybePtrFromReservedSlot<struct xhr>(hobj, 0);
if (xhr && xhr->download.conn) { if (xhr && xhr->download.conn) {
@ -400,7 +399,6 @@ xhr_addEventListener(JSContext *ctx, unsigned int argc, JS::Value *rval)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct xhr *xhr = JS::GetMaybePtrFromReservedSlot<struct xhr>(hobj, 0); struct xhr *xhr = JS::GetMaybePtrFromReservedSlot<struct xhr>(hobj, 0);
if (argc < 2) { if (argc < 2) {
@ -449,7 +447,6 @@ xhr_removeEventListener(JSContext *ctx, unsigned int argc, JS::Value *rval)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct xhr *xhr = JS::GetMaybePtrFromReservedSlot<struct xhr>(hobj, 0); struct xhr *xhr = JS::GetMaybePtrFromReservedSlot<struct xhr>(hobj, 0);
if (argc < 2) { if (argc < 2) {
@ -499,9 +496,7 @@ xhr_getAllResponseHeaders(JSContext *ctx, unsigned int argc, JS::Value *rval)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct xhr *xhr = JS::GetMaybePtrFromReservedSlot<struct xhr>(hobj, 0); struct xhr *xhr = JS::GetMaybePtrFromReservedSlot<struct xhr>(hobj, 0);
struct view_state *vs = interpreter->vs;
if (!xhr) { if (!xhr) {
return false; return false;
@ -531,9 +526,7 @@ xhr_getResponseHeader(JSContext *ctx, unsigned int argc, JS::Value *rval)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct xhr *xhr = JS::GetMaybePtrFromReservedSlot<struct xhr>(hobj, 0); struct xhr *xhr = JS::GetMaybePtrFromReservedSlot<struct xhr>(hobj, 0);
struct view_state *vs = interpreter->vs;
if (!xhr || argc == 0) { if (!xhr || argc == 0) {
return false; return false;
@ -1122,12 +1115,7 @@ xhr_setRequestHeader(JSContext *ctx, unsigned int argc, JS::Value *rval)
#endif #endif
return false; return false;
} }
struct ecmascript_interpreter *interpreter = (struct ecmascript_interpreter *)JS::GetRealmPrivate(comp);
struct xhr *xhr = JS::GetMaybePtrFromReservedSlot<struct xhr>(hobj, 0); struct xhr *xhr = JS::GetMaybePtrFromReservedSlot<struct xhr>(hobj, 0);
struct view_state *vs;
struct document_view *doc_view;
vs = interpreter->vs;
doc_view = vs->doc_view;
if (!xhr) { if (!xhr) {
return false; return false;