diff --git a/include/dwarfs/reader/filesystem_v2.h b/include/dwarfs/reader/filesystem_v2.h index eb48c68e..978a7c75 100644 --- a/include/dwarfs/reader/filesystem_v2.h +++ b/include/dwarfs/reader/filesystem_v2.h @@ -141,32 +141,34 @@ class filesystem_v2 { } file_stat getattr(inode_view entry, std::error_code& ec) const { - return impl_->getattr(entry, ec); + return impl_->getattr(std::move(entry), ec); } - file_stat getattr(inode_view entry) const { return impl_->getattr(entry); } + file_stat getattr(inode_view entry) const { + return impl_->getattr(std::move(entry)); + } file_stat getattr(inode_view entry, getattr_options const& opts, std::error_code& ec) const { - return impl_->getattr(entry, opts, ec); + return impl_->getattr(std::move(entry), opts, ec); } file_stat getattr(inode_view entry, getattr_options const& opts) const { - return impl_->getattr(entry, opts); + return impl_->getattr(std::move(entry), opts); } bool access(inode_view entry, int mode, file_stat::uid_type uid, file_stat::gid_type gid) const { - return impl_->access(entry, mode, uid, gid); + return impl_->access(std::move(entry), mode, uid, gid); } void access(inode_view entry, int mode, file_stat::uid_type uid, file_stat::gid_type gid, std::error_code& ec) const { - impl_->access(entry, mode, uid, gid, ec); + impl_->access(std::move(entry), mode, uid, gid, ec); } std::optional opendir(inode_view entry) const { - return impl_->opendir(entry); + return impl_->opendir(std::move(entry)); } std::optional @@ -178,24 +180,24 @@ class filesystem_v2 { std::string readlink(inode_view entry, readlink_mode mode, std::error_code& ec) const { - return impl_->readlink(entry, mode, ec); + return impl_->readlink(std::move(entry), mode, ec); } std::string readlink(inode_view entry, std::error_code& ec) const { - return impl_->readlink(entry, readlink_mode::preferred, ec); + return impl_->readlink(std::move(entry), readlink_mode::preferred, ec); } std::string readlink(inode_view entry, readlink_mode mode = readlink_mode::preferred) const { - return impl_->readlink(entry, mode); + return impl_->readlink(std::move(entry), mode); } void statvfs(vfs_stat* stbuf) const { impl_->statvfs(stbuf); } - int open(inode_view entry) const { return impl_->open(entry); } + int open(inode_view entry) const { return impl_->open(std::move(entry)); } int open(inode_view entry, std::error_code& ec) const { - return impl_->open(entry, ec); + return impl_->open(std::move(entry), ec); } std::string read_string(uint32_t inode) const { @@ -321,11 +323,11 @@ class filesystem_v2 { history const& get_history() const { return impl_->get_history(); } nlohmann::json get_inode_info(inode_view entry) const { - return impl_->get_inode_info(entry); + return impl_->get_inode_info(std::move(entry)); } nlohmann::json get_inode_info(inode_view entry, size_t max_chunks) const { - return impl_->get_inode_info(entry, max_chunks); + return impl_->get_inode_info(std::move(entry), max_chunks); } std::vector get_all_block_categories() const { diff --git a/include/dwarfs/reader/internal/metadata_v2.h b/include/dwarfs/reader/internal/metadata_v2.h index a1d86883..14e22801 100644 --- a/include/dwarfs/reader/internal/metadata_v2.h +++ b/include/dwarfs/reader/internal/metadata_v2.h @@ -114,16 +114,16 @@ class metadata_v2 { } file_stat getattr(inode_view iv, std::error_code& ec) const { - return impl_->getattr(iv, ec); + return impl_->getattr(std::move(iv), ec); } file_stat getattr(inode_view iv, getattr_options const& opts, std::error_code& ec) const { - return impl_->getattr(iv, opts, ec); + return impl_->getattr(std::move(iv), opts, ec); } std::optional opendir(inode_view iv) const { - return impl_->opendir(iv); + return impl_->opendir(std::move(iv)); } std::optional @@ -135,16 +135,16 @@ class metadata_v2 { void access(inode_view iv, int mode, file_stat::uid_type uid, file_stat::gid_type gid, std::error_code& ec) const { - impl_->access(iv, mode, uid, gid, ec); + impl_->access(std::move(iv), mode, uid, gid, ec); } int open(inode_view iv, std::error_code& ec) const { - return impl_->open(iv, ec); + return impl_->open(std::move(iv), ec); } std::string readlink(inode_view iv, readlink_mode mode, std::error_code& ec) const { - return impl_->readlink(iv, mode, ec); + return impl_->readlink(std::move(iv), mode, ec); } void statvfs(vfs_stat* stbuf) const { impl_->statvfs(stbuf); } @@ -158,7 +158,7 @@ class metadata_v2 { bool has_symlinks() const { return impl_->has_symlinks(); } nlohmann::json get_inode_info(inode_view iv, size_t max_chunks) const { - return impl_->get_inode_info(iv, max_chunks); + return impl_->get_inode_info(std::move(iv), max_chunks); } std::optional get_block_category(size_t block_number) const { diff --git a/include/dwarfs/writer/compression_metadata_requirements.h b/include/dwarfs/writer/compression_metadata_requirements.h index fefb8e3e..6bda9a3a 100644 --- a/include/dwarfs/writer/compression_metadata_requirements.h +++ b/include/dwarfs/writer/compression_metadata_requirements.h @@ -215,7 +215,7 @@ class typed_metadata_requirement_base value_parser_type value_parser) : checked_metadata_requirement_base(name) , mp_{mp} - , value_parser_{value_parser} {} + , value_parser_{std::move(value_parser)} {} void check(Meta const& m) const override { check_value(m.*mp_); } diff --git a/include/dwarfs/writer/entry_factory.h b/include/dwarfs/writer/entry_factory.h index b1565096..1fbb193e 100644 --- a/include/dwarfs/writer/entry_factory.h +++ b/include/dwarfs/writer/entry_factory.h @@ -43,7 +43,7 @@ class entry_factory { std::shared_ptr create(os_access const& os, std::filesystem::path const& path, std::shared_ptr parent = nullptr) { - return impl_->create(os, path, parent); + return impl_->create(os, path, std::move(parent)); } class impl { diff --git a/include/dwarfs/writer/scanner.h b/include/dwarfs/writer/scanner.h index 35f84937..1fa1c44c 100644 --- a/include/dwarfs/writer/scanner.h +++ b/include/dwarfs/writer/scanner.h @@ -64,7 +64,7 @@ class scanner { writer_progress& prog, std::optional> list = std::nullopt, std::shared_ptr fa = nullptr) { - impl_->scan(fsw, path, prog, list, fa); + impl_->scan(fsw, path, prog, list, std::move(fa)); } class impl { diff --git a/src/reader/internal/block_cache.cpp b/src/reader/internal/block_cache.cpp index c4febb5d..1e2b7a54 100644 --- a/src/reader/internal/block_cache.cpp +++ b/src/reader/internal/block_cache.cpp @@ -155,7 +155,9 @@ class block_request { promise_.set_value(block_range(std::move(block), begin_, end_ - begin_)); } - void error(std::exception_ptr error) { promise_.set_exception(error); } + void error(std::exception_ptr error) { + promise_.set_exception(std::move(error)); + } private: size_t begin_{0}; diff --git a/src/writer/category_parser.cpp b/src/writer/category_parser.cpp index ea4d43f1..a0c3437b 100644 --- a/src/writer/category_parser.cpp +++ b/src/writer/category_parser.cpp @@ -29,7 +29,7 @@ namespace dwarfs::writer { category_parser::category_parser( std::shared_ptr resolver) - : resolver_{resolver} {} + : resolver_{std::move(resolver)} {} std::vector category_parser::parse(std::string_view arg) const { diff --git a/src/writer/console_writer.cpp b/src/writer/console_writer.cpp index 03cd44e5..f152353e 100644 --- a/src/writer/console_writer.cpp +++ b/src/writer/console_writer.cpp @@ -163,7 +163,7 @@ void output_context_line(terminal const& term, std::ostream& os, console_writer::console_writer(std::shared_ptr term, std::ostream& os, progress_mode pg_mode, display_mode mode, logger_options const& options) - : stream_logger(term, os, options) + : stream_logger(std::move(term), os, options) , pg_mode_(pg_mode) , mode_(mode) {} diff --git a/src/writer/filesystem_writer.cpp b/src/writer/filesystem_writer.cpp index bd35c5a5..5576cc23 100644 --- a/src/writer/filesystem_writer.cpp +++ b/src/writer/filesystem_writer.cpp @@ -797,7 +797,7 @@ void filesystem_writer_::write_block_impl( auto fsb = std::make_unique(section_type::BLOCK, bc, std::move(data), pctx, std::move(physical_block_cb)); - fsb->compress(wg_, meta); + fsb->compress(wg_, std::move(meta)); merger_->add(cat, std::move(fsb)); } diff --git a/src/writer/internal/scanner_progress.cpp b/src/writer/internal/scanner_progress.cpp index def87ba4..58399c8d 100644 --- a/src/writer/internal/scanner_progress.cpp +++ b/src/writer/internal/scanner_progress.cpp @@ -25,7 +25,7 @@ namespace dwarfs::writer::internal { scanner_progress::scanner_progress(std::string_view context, std::string file, size_t size) - : scanner_progress(termcolor::YELLOW, context, file, size) {} + : scanner_progress(termcolor::YELLOW, context, std::move(file), size) {} scanner_progress::scanner_progress(termcolor color, std::string_view context, std::string file, size_t size)