Skip to content

Commit c011542

Browse files
committedMar 20, 2020
src: prefer OnScopeLeave over shared_ptr<void>
They do the same thing, but OnScopeLeave avoids an extra heap allocation and is more explicit about what it does. PR-URL: nodejs#32247 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Matheus Marchini <[email protected]>
1 parent f7771ff commit c011542

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed
 

‎src/node_file.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ static void InternalModuleReadJSON(const FunctionCallbackInfo<Value>& args) {
832832
return;
833833
}
834834

835-
std::shared_ptr<void> defer_close(nullptr, [fd, loop] (...) {
835+
auto defer_close = OnScopeLeave([fd, loop]() {
836836
uv_fs_t close_req;
837837
CHECK_EQ(0, uv_fs_close(loop, &close_req, fd, nullptr));
838838
uv_fs_req_cleanup(&close_req);

‎src/node_native_module.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ MaybeLocal<String> NativeModuleLoader::LoadBuiltinModuleSource(Isolate* isolate,
202202
CHECK_GE(req.result, 0);
203203
uv_fs_req_cleanup(&req);
204204

205-
std::shared_ptr<void> defer_close(nullptr, [file](...) {
205+
auto defer_close = OnScopeLeave([file]() {
206206
uv_fs_t close_req;
207207
CHECK_EQ(0, uv_fs_close(nullptr, &close_req, file, nullptr));
208208
uv_fs_req_cleanup(&close_req);

0 commit comments

Comments
 (0)
Please sign in to comment.