summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnatoli Papirovski <apapirovski@mac.com>2018-01-21 10:34:36 -0500
committerAnatoli Papirovski <apapirovski@mac.com>2018-01-29 11:37:28 -0500
commit7d3a3028ffba22d3cb06e2b6e3e3365abd525410 (patch)
tree9ba0e2671e5600624da3c6cf5576fc8047d9bdb7 /src
parent46e0a55b8492d15acf8cf4fcbcd3c8671e2e30f8 (diff)
downloadandroid-node-v8-7d3a3028ffba22d3cb06e2b6e3e3365abd525410.tar.gz
android-node-v8-7d3a3028ffba22d3cb06e2b6e3e3365abd525410.tar.bz2
android-node-v8-7d3a3028ffba22d3cb06e2b6e3e3365abd525410.zip
src: remove unnecessary block scope
PR-URL: https://github.com/nodejs/node/pull/18291 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/node.cc16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/node.cc b/src/node.cc
index 656d132ec9..dd6a44bbae 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1066,17 +1066,13 @@ MaybeLocal<Value> InternalMakeCallback(Environment* env,
return Undefined(env->isolate());
}
- MaybeLocal<Value> ret;
+ MaybeLocal<Value> 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();