From 904aa7c09a389c8093ff688aac7b2cd31c473a4e Mon Sep 17 00:00:00 2001 From: himself65 Date: Sat, 30 May 2020 17:40:15 +0800 Subject: [PATCH 1/4] src: simplify format in node_file.cc --- src/node_file.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/node_file.cc b/src/node_file.cc index 09af257b1b3780..1ed65b52ea9e9d 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -454,9 +454,8 @@ int FileHandle::ReadStart() { // Push the read wrap back to the freelist, or let it be destroyed // once we’re exiting the current scope. - constexpr size_t wanted_freelist_fill = 100; auto& freelist = handle->binding_data_->file_handle_read_wrap_freelist; - if (freelist.size() < wanted_freelist_fill) { + if (freelist.size() < /* wanted_freelist_fill */ 100) { read_wrap->Reset(); freelist.emplace_back(std::move(read_wrap)); } @@ -721,7 +720,7 @@ void AfterScanDir(uv_fs_t* req) { int r; std::vector> name_v; - for (int i = 0; ; i++) { + while (true) { uv_dirent_t ent; r = uv_fs_scandir_next(req, &ent); @@ -762,7 +761,7 @@ void AfterScanDirWithTypes(uv_fs_t* req) { std::vector> name_v; std::vector> type_v; - for (int i = 0; ; i++) { + while (true) { uv_dirent_t ent; r = uv_fs_scandir_next(req, &ent); From 026fefd88749b2b9253570b49747e923e509baff Mon Sep 17 00:00:00 2001 From: himself65 Date: Sun, 31 May 2020 01:36:13 +0800 Subject: [PATCH 2/4] fixup! --- src/node_file.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/node_file.cc b/src/node_file.cc index 1ed65b52ea9e9d..9c0aef346ac66d 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -454,8 +454,9 @@ int FileHandle::ReadStart() { // Push the read wrap back to the freelist, or let it be destroyed // once we’re exiting the current scope. + constexpr size_t kWantedFreelistFill = 100; auto& freelist = handle->binding_data_->file_handle_read_wrap_freelist; - if (freelist.size() < /* wanted_freelist_fill */ 100) { + if (freelist.size() < kWantedFreelistFill) { read_wrap->Reset(); freelist.emplace_back(std::move(read_wrap)); } From 3de1129742bed52419d7791dccffcf38161b1851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=A9=E6=95=A3=E6=80=A7=E7=99=BE=E4=B8=87=E7=94=9C?= =?UTF-8?q?=E9=9D=A2=E5=8C=85?= Date: Sun, 31 May 2020 14:44:14 +0800 Subject: [PATCH 3/4] fixup! Co-authored-by: Yash Ladha <201551061@iiitvadodara.ac.in> --- src/node_file.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_file.cc b/src/node_file.cc index 9c0aef346ac66d..3ad76bb43dd2a4 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -721,7 +721,7 @@ void AfterScanDir(uv_fs_t* req) { int r; std::vector> name_v; - while (true) { + for (;;) { uv_dirent_t ent; r = uv_fs_scandir_next(req, &ent); From a93aa82e9605cd4c64407309a158e980f57849c1 Mon Sep 17 00:00:00 2001 From: himself65 Date: Sun, 31 May 2020 21:20:26 +0800 Subject: [PATCH 4/4] fixup! --- src/node_file.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_file.cc b/src/node_file.cc index 3ad76bb43dd2a4..c2ed56f43fb0ae 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -762,7 +762,7 @@ void AfterScanDirWithTypes(uv_fs_t* req) { std::vector> name_v; std::vector> type_v; - while (true) { + for (;;) { uv_dirent_t ent; r = uv_fs_scandir_next(req, &ent);