From 654e1ee12ac3d405b4a98735179d749dc0047d05 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Mon, 6 May 2019 15:09:47 +0100 Subject: Use new safe context dump Signed-off-by: Daniel Silverstone --- content/handlers/javascript/duktape/Window.bnd | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'content') diff --git a/content/handlers/javascript/duktape/Window.bnd b/content/handlers/javascript/duktape/Window.bnd index 5283a14ad..f71ebd609 100644 --- a/content/handlers/javascript/duktape/Window.bnd +++ b/content/handlers/javascript/duktape/Window.bnd @@ -62,9 +62,7 @@ static void window_call_callback(duk_context *ctx, size_t handle, bool clear_ent /* ..., win, cbt, handle */ duk_get_prop(ctx, -2); /* ..., win, cbt, cbo */ - duk_push_context_dump(ctx); - NSLOG(dukky, DEEPDEBUG, "On entry to callback, stack is: %s", duk_get_string(ctx, -1)); - duk_pop(ctx); + dukky_log_stack_frame(ctx, "On entry to callback"); /* ..., win, cbt, cbo */ /* What we want to do is call cbo.func passing all of cbo.args */ duk_get_prop_string(ctx, -1, "func"); @@ -78,9 +76,7 @@ static void window_call_callback(duk_context *ctx, size_t handle, bool clear_ent /* ..., win, cbt, cbo, func, argarr, args... */ duk_remove(ctx, -(arrlen+1)); /* ..., win, cbt, cbo, func, args... */ - duk_push_context_dump(ctx); - NSLOG(dukky, DEEPDEBUG, "Just before call with %d args: %s", (int)arrlen, duk_get_string(ctx, -1)); - duk_pop(ctx); + dukky_log_stack_frame(ctx, "Just before call"); (void) dukky_pcall(ctx, arrlen, true); /* ..., win, cbt, cbo, retval */ if (clear_entry) { @@ -96,9 +92,7 @@ static void window_call_callback(duk_context *ctx, size_t handle, bool clear_ent duk_pop_n(ctx, 4); } /* ... */ - duk_push_context_dump(ctx); - NSLOG(dukky, DEEPDEBUG, "On leaving callback, stack is: %s", duk_get_string(ctx, -1)); - duk_pop(ctx); + dukky_log_stack_frame(ctx, "On leaving callback"); } static void window_schedule_callback(void *p) { -- cgit v1.2.3