diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b6e6a5f..f9395f9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -662,10 +662,10 @@ list(APPEND LIBDWARFS_WRITER_SRC src/dwarfs/internal/global_entry_data.cpp src/dwarfs/internal/inode_manager.cpp src/dwarfs/internal/metadata_freezer.cpp + src/dwarfs/internal/scanner_progress.cpp src/dwarfs/nilsimsa.cpp src/dwarfs/progress.cpp src/dwarfs/scanner.cpp - src/dwarfs/scanner_progress.cpp src/dwarfs/segmenter.cpp src/dwarfs/segmenter_factory.cpp src/dwarfs/similarity.cpp diff --git a/include/dwarfs/scanner_progress.h b/include/dwarfs/internal/scanner_progress.h similarity index 95% rename from include/dwarfs/scanner_progress.h rename to include/dwarfs/internal/scanner_progress.h index 693e716b..45016ea5 100644 --- a/include/dwarfs/scanner_progress.h +++ b/include/dwarfs/internal/scanner_progress.h @@ -27,7 +27,7 @@ #include #include -namespace dwarfs { +namespace dwarfs::internal { class scanner_progress : public progress::context { public: @@ -48,4 +48,4 @@ class scanner_progress : public progress::context { size_t const bytes_total_; }; -} // namespace dwarfs +} // namespace dwarfs::internal diff --git a/src/dwarfs/entry.cpp b/src/dwarfs/entry.cpp index 2b870aa0..2378561b 100644 --- a/src/dwarfs/entry.cpp +++ b/src/dwarfs/entry.cpp @@ -35,10 +35,10 @@ #include #include #include -#include #include #include +#include #include @@ -222,11 +222,11 @@ void file::scan(mmif* mm, progress& prog, checksum cs(*hash_alg); if (s > 0) { - std::shared_ptr pctx; + std::shared_ptr pctx; auto const chunk_size = prog.hash.chunk_size.load(); if (s >= 4 * chunk_size) { - pctx = prog.create_context( + pctx = prog.create_context( termcolor::MAGENTA, kHashContext, path_as_string(), s); } diff --git a/src/dwarfs/internal/inode_manager.cpp b/src/dwarfs/internal/inode_manager.cpp index 6a06abcb..de9bc7fe 100644 --- a/src/dwarfs/internal/inode_manager.cpp +++ b/src/dwarfs/internal/inode_manager.cpp @@ -53,13 +53,13 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include diff --git a/src/dwarfs/scanner_progress.cpp b/src/dwarfs/internal/scanner_progress.cpp similarity index 93% rename from src/dwarfs/scanner_progress.cpp rename to src/dwarfs/internal/scanner_progress.cpp index c23dec6e..339e4da7 100644 --- a/src/dwarfs/scanner_progress.cpp +++ b/src/dwarfs/internal/scanner_progress.cpp @@ -19,9 +19,9 @@ * along with dwarfs. If not, see . */ -#include +#include -namespace dwarfs { +namespace dwarfs::internal { scanner_progress::scanner_progress(std::string_view context, std::string file, size_t size) @@ -44,4 +44,4 @@ auto scanner_progress::get_status() const -> status { return st; } -} // namespace dwarfs +} // namespace dwarfs::internal