GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-06-04 11:13:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Warning fixes for -Wall -Wextra -Werror builds.

Browse Source
This commit is contained in:
gulrak 2018-11-05 20:40:53 +01:00
parent f756027cca
commit 89cc3782a0
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
filesystem.h
View File

@ -1099,12 +1099,12 @@ inline unsigned consumeUtf8Fragment(const unsigned state, const uint8_t fragment
} }
template <class StringType> template <class StringType>
inline StringType fromUtf8(const std::string& utf8String) inline StringType fromUtf8(const std::string& utf8String, const typename StringType::allocator_type& alloc = typename StringType::allocator_type())
{ {
if (sizeof(typename StringType::value_type) == 1) { if (sizeof(typename StringType::value_type) == 1) {
return StringType(utf8String.begin(), utf8String.end()); return StringType(utf8String.begin(), utf8String.end());
} }
StringType result; StringType result(alloc);
result.reserve(utf8String.length()); result.reserve(utf8String.length());
std::string::const_iterator iter = utf8String.begin(); std::string::const_iterator iter = utf8String.begin();
unsigned utf8_state = S_STRT; unsigned utf8_state = S_STRT;
@ -1327,7 +1327,7 @@ inline void create_hardlink(const path& target_name, const path& new_hardlink, s
} }
} }
#else #else
inline void create_symlink(const path& target_name, const path& new_symlink, bool to_directory, std::error_code& ec) inline void create_symlink(const path& target_name, const path& new_symlink, bool, std::error_code& ec)
{ {
if (::symlink(target_name.c_str(), new_symlink.c_str()) != 0) { if (::symlink(target_name.c_str(), new_symlink.c_str()) != 0) {
ec = std::error_code(errno, std::system_category()); ec = std::error_code(errno, std::system_category());
@ -1568,6 +1568,7 @@ inline file_status symlink_status_ex(const path& p, std::error_code& ec, uintmax
} }
return ec ? file_status(file_type::none) : fs; return ec ? file_status(file_type::none) : fs;
#else #else
(void)sz; (void)nhl; (void)lwt;
struct ::stat fs; struct ::stat fs;
auto result = ::lstat(p.c_str(), &fs); auto result = ::lstat(p.c_str(), &fs);
if (result == 0) { if (result == 0) {
@ -1618,6 +1619,7 @@ inline file_status status_ex(const path& p, std::error_code& ec, file_status* sl
} }
return detail::status_from_INFO(p, &attr, ec, sz, lwt); return detail::status_from_INFO(p, &attr, ec, sz, lwt);
#else #else
(void)recurse_count;
struct ::stat st; struct ::stat st;
auto result = ::lstat(p.c_str(), &st); auto result = ::lstat(p.c_str(), &st);
if (result == 0) { if (result == 0) {
@ -1984,7 +1986,7 @@ inline path::operator path::string_type() const
template <class EcharT, class traits, class Allocator> template <class EcharT, class traits, class Allocator>
inline std::basic_string<EcharT, traits, Allocator> path::string(const Allocator& a) const inline std::basic_string<EcharT, traits, Allocator> path::string(const Allocator& a) const
{ {
return detail::fromUtf8<std::basic_string<EcharT, traits, Allocator>>(native()); return detail::fromUtf8<std::basic_string<EcharT, traits, Allocator>>(native(), a);
} }
inline std::string path::string() const inline std::string path::string() const
@ -2017,7 +2019,7 @@ inline std::u32string path::u32string() const
template <class EcharT, class traits, class Allocator> template <class EcharT, class traits, class Allocator>
std::basic_string<EcharT, traits, Allocator> path::generic_string(const Allocator& a) const std::basic_string<EcharT, traits, Allocator> path::generic_string(const Allocator& a) const
{ {
detail::fromUtf8<std::basic_string<EcharT, traits, Allocator>>(_path); detail::fromUtf8<std::basic_string<EcharT, traits, Allocator>>(_path, a);
} }
inline const std::string& path::generic_string() const inline const std::string& path::generic_string() const
@ -2884,7 +2886,7 @@ inline bool copy_file(const path& from, const path& to, copy_options options, st
ec = std::error_code(errno, std::system_category()); ec = std::error_code(errno, std::system_category());
return false; return false;
} }
std::shared_ptr<void> guard_out(nullptr, [out](void* ptr) { ::close(out); }); std::shared_ptr<void> guard_out(nullptr, [out](void*) { ::close(out); });
int mode = O_CREAT | O_WRONLY | O_TRUNC; int mode = O_CREAT | O_WRONLY | O_TRUNC;
if (!overwrite) { if (!overwrite) {
mode |= O_EXCL; mode |= O_EXCL;
@ -2893,7 +2895,7 @@ inline bool copy_file(const path& from, const path& to, copy_options options, st
ec = std::error_code(errno, std::system_category()); ec = std::error_code(errno, std::system_category());
return false; return false;
} }
std::shared_ptr<void> guard_in(nullptr, [in](void* ptr) { ::close(in); }); std::shared_ptr<void> guard_in(nullptr, [in](void*) { ::close(in); });
ssize_t br, bw; ssize_t br, bw;
while ((br = ::read(in, buffer.data(), buffer.size())) > 0) { while ((br = ::read(in, buffer.data(), buffer.size())) > 0) {
int offset = 0; int offset = 0;
@ -4140,7 +4142,7 @@ inline bool directory_entry::is_socket() const
inline bool directory_entry::is_socket(std::error_code& ec) const noexcept inline bool directory_entry::is_socket(std::error_code& ec) const noexcept
{ {
return filesystem::is_socket(status()); return filesystem::is_socket(status(ec));
} }
inline bool directory_entry::is_symlink() const inline bool directory_entry::is_symlink() const
@ -4693,7 +4695,7 @@ inline void recursive_directory_iterator::pop()
} }
} }
inline void recursive_directory_iterator::pop(std::error_code& ec) inline void recursive_directory_iterator::pop(std::error_code&)
{ {
pop(); pop();
} }

4
test/CMakeLists.txt
View File

@ -1,5 +1,9 @@
add_executable(filesystem_test filesystem_test.cpp ../filesystem.h catch.hpp) add_executable(filesystem_test filesystem_test.cpp ../filesystem.h catch.hpp)
target_compile_options(filesystem_test PRIVATE
$<$<CXX_COMPILER_ID:Clang>:-Wall -Wextra -Werror>
$<$<CXX_COMPILER_ID:GNU>:-Wall -Werror>
$<$<CXX_COMPILER_ID:MSVC>:/WX>)
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC) if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
target_compile_definitions(filesystem_test PRIVATE _CRT_SECURE_NO_WARNINGS) target_compile_definitions(filesystem_test PRIVATE _CRT_SECURE_NO_WARNINGS)
endif() endif()

3
test/filesystem_test.cpp
View File

@ -1854,7 +1854,8 @@ TEST_CASE_METHOD(FileTypeMixFixture, "30.10.15.24 is_symlink", "[filesystem][ope
static fs::file_time_type timeFromString(const std::string& str) static fs::file_time_type timeFromString(const std::string& str)
{ {
struct ::tm tm = {0}; struct ::tm tm;
::memset(&tm, 0, sizeof(::tm));
std::istringstream is(str); std::istringstream is(str);
is >> std::get_time(&tm, "%Y-%m-%dT%H:%M:%S"); is >> std::get_time(&tm, "%Y-%m-%dT%H:%M:%S");
if (is.fail()) { if (is.fail()) {