diff options
Diffstat (limited to 'libcxx/src/filesystem/directory_iterator.cpp')
| -rw-r--r-- | libcxx/src/filesystem/directory_iterator.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libcxx/src/filesystem/directory_iterator.cpp b/libcxx/src/filesystem/directory_iterator.cpp index 2721dea5c98f..7b83ba9ff123 100644 --- a/libcxx/src/filesystem/directory_iterator.cpp +++ b/libcxx/src/filesystem/directory_iterator.cpp @@ -124,7 +124,8 @@ public: ec = detail::make_windows_error(GetLastError()); const bool ignore_permission_denied = bool(opts & directory_options::skip_permission_denied); - if (ignore_permission_denied && ec.value() == ERROR_ACCESS_DENIED) + if (ignore_permission_denied && + ec.value() == static_cast<int>(errc::permission_denied)) ec.clear(); return; } @@ -272,7 +273,7 @@ directory_iterator& directory_iterator::__increment(error_code* ec) { path root = move(__imp_->__root_); __imp_.reset(); if (m_ec) - err.report(m_ec, "at root \"%s\"", root); + err.report(m_ec, "at root " PATH_CSTR_FMT, root.c_str()); } return *this; } @@ -359,7 +360,7 @@ void recursive_directory_iterator::__advance(error_code* ec) { if (m_ec) { path root = move(stack.top().__root_); __imp_.reset(); - err.report(m_ec, "at root \"%s\"", root); + err.report(m_ec, "at root " PATH_CSTR_FMT, root.c_str()); } else { __imp_.reset(); } @@ -404,7 +405,8 @@ bool recursive_directory_iterator::__try_recursion(error_code* ec) { } else { path at_ent = move(curr_it.__entry_.__p_); __imp_.reset(); - err.report(m_ec, "attempting recursion into \"%s\"", at_ent); + err.report(m_ec, "attempting recursion into " PATH_CSTR_FMT, + at_ent.c_str()); } } return false; |