Skip to content

Commit c797c7c

Browse files
danbevcodebytere
authored andcommittedJun 9, 2020
src: reduce duplication in RegisterHandleCleanups
This commit suggest using a lambda for the RegisterHandlerCleanup calls in RegisterHandleCleanups. The motivation is to reduce some duplication and to make it a little easier to read as all of the calls pass in the same arguments, apart from casting the uv handle. PR-URL: #33421 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Zeyu Yang <himself65@outlook.com> Reviewed-By: David Carlier <devnexen@gmail.com>
1 parent 0c9b826 commit c797c7c

File tree

1 file changed

+9
-24
lines changed

1 file changed

+9
-24
lines changed
 

‎src/env.cc

+9-24
Original file line numberDiff line numberDiff line change
@@ -535,30 +535,15 @@ void Environment::RegisterHandleCleanups() {
535535
});
536536
};
537537

538-
RegisterHandleCleanup(
539-
reinterpret_cast<uv_handle_t*>(timer_handle()),
540-
close_and_finish,
541-
nullptr);
542-
RegisterHandleCleanup(
543-
reinterpret_cast<uv_handle_t*>(immediate_check_handle()),
544-
close_and_finish,
545-
nullptr);
546-
RegisterHandleCleanup(
547-
reinterpret_cast<uv_handle_t*>(immediate_idle_handle()),
548-
close_and_finish,
549-
nullptr);
550-
RegisterHandleCleanup(
551-
reinterpret_cast<uv_handle_t*>(&idle_prepare_handle_),
552-
close_and_finish,
553-
nullptr);
554-
RegisterHandleCleanup(
555-
reinterpret_cast<uv_handle_t*>(&idle_check_handle_),
556-
close_and_finish,
557-
nullptr);
558-
RegisterHandleCleanup(
559-
reinterpret_cast<uv_handle_t*>(&task_queues_async_),
560-
close_and_finish,
561-
nullptr);
538+
auto register_handle = [&](uv_handle_t* handle) {
539+
RegisterHandleCleanup(handle, close_and_finish, nullptr);
540+
};
541+
register_handle(reinterpret_cast<uv_handle_t*>(timer_handle()));
542+
register_handle(reinterpret_cast<uv_handle_t*>(immediate_check_handle()));
543+
register_handle(reinterpret_cast<uv_handle_t*>(immediate_idle_handle()));
544+
register_handle(reinterpret_cast<uv_handle_t*>(&idle_prepare_handle_));
545+
register_handle(reinterpret_cast<uv_handle_t*>(&idle_check_handle_));
546+
register_handle(reinterpret_cast<uv_handle_t*>(&task_queues_async_));
562547
}
563548

564549
void Environment::CleanupHandles() {

0 commit comments

Comments
 (0)
Please sign in to comment.