From 3ab391d3d3c8b94d77405a3e023b22c0b1d05726 Mon Sep 17 00:00:00 2001 From: Anatoli Papirovski Date: Sun, 21 Jan 2018 10:34:36 -0500 Subject: [PATCH] src: remove unnecessary block scope PR-URL: https://github.com/nodejs/node/pull/18291 Reviewed-By: Ben Noordhuis Reviewed-By: Anna Henningsen Reviewed-By: James M Snell --- src/node.cc | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/node.cc b/src/node.cc index def2b6148776aa..980272842a3439 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1379,17 +1379,13 @@ MaybeLocal InternalMakeCallback(Environment* env, return Undefined(env->isolate()); } - MaybeLocal ret; + MaybeLocal ret = callback->Call(env->context(), recv, argc, argv); - { - ret = callback->Call(env->context(), recv, argc, argv); - - if (ret.IsEmpty()) { - // NOTE: For backwards compatibility with public API we return Undefined() - // if the top level call threw. - scope.MarkAsFailed(); - return scope.IsInnerMakeCallback() ? ret : Undefined(env->isolate()); - } + if (ret.IsEmpty()) { + // NOTE: For backwards compatibility with public API we return Undefined() + // if the top level call threw. + scope.MarkAsFailed(); + return scope.IsInnerMakeCallback() ? ret : Undefined(env->isolate()); } scope.Close();