dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[dart:io] Remove double-close from recursive directory delete

Browse Source 
closedir() closes the file descriptor wrapped by the DIR, so we
shouldn't close it again.

R=bkonyi@google.com

Review-Url: https://codereview.chromium.org/3005883002 .
This commit is contained in:
Zachary Anderson
2017-08-30 12:48:57 -07:00
parent e28aac09c4
commit 732bb45c45
3 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/bin/directory_android.cc
-2
View File
@@ -303,7 +303,6 @@ static bool DeleteRecursively(int dirfd, PathBuffer* path) {
}
// End of directory.
int status = NO_RETRY_EXPECTED(closedir(dir_pointer));
FDUtils::SaveErrorAndClose(fd);
if (status != 0) {
return false;
}
@@ -364,7 +363,6 @@ static bool DeleteRecursively(int dirfd, PathBuffer* path) {
ASSERT(errno != 0);
int err = errno;
VOID_NO_RETRY_EXPECTED(closedir(dir_pointer));
FDUtils::SaveErrorAndClose(fd);
errno = err;
return false;
}
runtime/bin/directory_fuchsia.cc
-2
View File
@@ -413,7 +413,6 @@ static bool DeleteRecursively(int dirfd, PathBuffer* path) {
}
// End of directory.
int status = NO_RETRY_EXPECTED(closedir(dir_pointer));
FDUtils::SaveErrorAndClose(fd);
if (status != 0) {
return false;
}
@@ -474,7 +473,6 @@ static bool DeleteRecursively(int dirfd, PathBuffer* path) {
ASSERT(errno != 0);
int err = errno;
VOID_NO_RETRY_EXPECTED(closedir(dir_pointer));
FDUtils::SaveErrorAndClose(fd);
errno = err;
return false;
}
runtime/bin/directory_linux.cc
-2
View File
@@ -303,7 +303,6 @@ static bool DeleteRecursively(int dirfd, PathBuffer* path) {
}
// End of directory.
int status = NO_RETRY_EXPECTED(closedir(dir_pointer));
FDUtils::SaveErrorAndClose(fd);
if (status != 0) {
return false;
}
@@ -364,7 +363,6 @@ static bool DeleteRecursively(int dirfd, PathBuffer* path) {
ASSERT(errno != 0);
int err = errno;
VOID_NO_RETRY_EXPECTED(closedir(dir_pointer));
FDUtils::SaveErrorAndClose(fd);
errno = err;
return false;
}