diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-10-23 17:52:30 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-10-23 17:52:30 +0000 |
| commit | 243a6be085fe6a7ce49169864c68a8839735e49b (patch) | |
| tree | abfecf3c23dc7512ca48e72ac418b149c865e0f3 /src/filesystem | |
| parent | 1147845301c03308e3419b89c28c77bb6917fe04 (diff) | |
Notes
Diffstat (limited to 'src/filesystem')
| -rw-r--r-- | src/filesystem/directory_iterator.cpp | 12 | ||||
| -rw-r--r-- | src/filesystem/int128_builtins.cpp | 2 | ||||
| -rw-r--r-- | src/filesystem/operations.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/filesystem/directory_iterator.cpp b/src/filesystem/directory_iterator.cpp index ca88dee06402..e8941b3494b3 100644 --- a/src/filesystem/directory_iterator.cpp +++ b/src/filesystem/directory_iterator.cpp @@ -10,7 +10,7 @@ #include "__config" #if defined(_LIBCPP_WIN32API) #define WIN32_LEAN_AND_MEAN -#include <Windows.h> +#include <windows.h> #else #include <dirent.h> #endif @@ -79,14 +79,14 @@ static file_type get_file_type(const WIN32_FIND_DATA& data) { return file_type::unknown; } static uintmax_t get_file_size(const WIN32_FIND_DATA& data) { - return (data.nFileSizeHight * (MAXDWORD + 1)) + data.nFileSizeLow; + return (data.nFileSizeHigh * (MAXDWORD + 1)) + data.nFileSizeLow; } static file_time_type get_write_time(const WIN32_FIND_DATA& data) { ULARGE_INTEGER tmp; - FILETIME& time = data.ftLastWriteTime; + const FILETIME& time = data.ftLastWriteTime; tmp.u.LowPart = time.dwLowDateTime; tmp.u.HighPart = time.dwHighDateTime; - return file_time_type(file_time_type::duration(time.QuadPart)); + return file_time_type(file_time_type::duration(tmp.QuadPart)); } #endif @@ -110,7 +110,7 @@ public: __dir_stream(const path& root, directory_options opts, error_code& ec) : __stream_(INVALID_HANDLE_VALUE), __root_(root) { - __stream_ = ::FindFirstFileEx(root.c_str(), &__data_); + __stream_ = ::FindFirstFile(root.c_str(), &__data_); if (__stream_ == INVALID_HANDLE_VALUE) { ec = error_code(::GetLastError(), generic_category()); const bool ignore_permission_denied = @@ -140,7 +140,7 @@ public: //cdata.__write_time_ = get_write_time(__data_); __entry_.__assign_iter_entry( __root_ / __data_.cFileName, - directory_entry::__create_iter_result(get_file_type(__data))); + directory_entry::__create_iter_result(detail::get_file_type(__data))); return true; } ec = error_code(::GetLastError(), generic_category()); diff --git a/src/filesystem/int128_builtins.cpp b/src/filesystem/int128_builtins.cpp index a55540fe276e..ed531ee145a2 100644 --- a/src/filesystem/int128_builtins.cpp +++ b/src/filesystem/int128_builtins.cpp @@ -18,7 +18,7 @@ #if !defined(_LIBCPP_HAS_NO_INT128) -extern "C" __attribute__((no_sanitize("undefined"))) +extern "C" __attribute__((no_sanitize("undefined"))) _LIBCPP_FUNC_VIS __int128_t __muloti4(__int128_t a, __int128_t b, int* overflow) { const int N = (int)(sizeof(__int128_t) * CHAR_BIT); const __int128_t MIN = (__int128_t)1 << (N - 1); diff --git a/src/filesystem/operations.cpp b/src/filesystem/operations.cpp index 69350ddfe9da..4e6cb1427a11 100644 --- a/src/filesystem/operations.cpp +++ b/src/filesystem/operations.cpp @@ -44,7 +44,7 @@ #include <sys/time.h> // for gettimeofday and timeval #endif // !defined(CLOCK_REALTIME) -#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA) +#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA) #pragma comment(lib, "rt") #endif |