From 0e3ceb0b30fdffee2e7cf4d63f439764c34c881a Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Tue, 20 Aug 2024 22:36:49 +0200 Subject: [PATCH] refactor: remove internal methods from public interface --- include/dwarfs/reader/metadata_types.h | 4 ---- src/reader/internal/metadata_v2.cpp | 7 ++++--- src/reader/metadata_types.cpp | 6 ------ 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/include/dwarfs/reader/metadata_types.h b/include/dwarfs/reader/metadata_types.h index 6747cf3c..f7c3182a 100644 --- a/include/dwarfs/reader/metadata_types.h +++ b/include/dwarfs/reader/metadata_types.h @@ -96,10 +96,6 @@ class dir_entry_view { std::filesystem::path fs_path() const; std::wstring wpath() const; - void append_to(std::filesystem::path& p) const; - - uint32_t self_index() const; - internal::dir_entry_view_impl const& raw() const { return *impl_; } private: diff --git a/src/reader/internal/metadata_v2.cpp b/src/reader/internal/metadata_v2.cpp index 2d2f8f7a..10542dc8 100644 --- a/src/reader/internal/metadata_v2.cpp +++ b/src/reader/internal/metadata_v2.cpp @@ -1171,8 +1171,8 @@ void metadata_::dump( os << " (" << count << " entries, parent=" << dir.parent_entry() << ")\n"; for (size_t i = 0; i < count; ++i) { - dump(os, indent, make_dir_entry_view(first + i, entry.self_index()), opts, - icb); + dump(os, indent, make_dir_entry_view(first + i, entry.raw().self_index()), + opts, icb); } } @@ -1328,7 +1328,8 @@ nlohmann::json metadata_::as_json(directory_view dir, auto first = dir.first_entry(); for (size_t i = 0; i < count; ++i) { - arr.push_back(as_json(make_dir_entry_view(first + i, entry.self_index()))); + arr.push_back( + as_json(make_dir_entry_view(first + i, entry.raw().self_index()))); } return arr; diff --git a/src/reader/metadata_types.cpp b/src/reader/metadata_types.cpp index 636117aa..fb0e200e 100644 --- a/src/reader/metadata_types.cpp +++ b/src/reader/metadata_types.cpp @@ -87,12 +87,6 @@ std::filesystem::path dir_entry_view::fs_path() const { std::wstring dir_entry_view::wpath() const { return impl_->wpath(); } -void dir_entry_view::append_to(std::filesystem::path& p) const { - impl_->append_to(p); -} - -uint32_t dir_entry_view::self_index() const { return impl_->self_index(); } - uint32_t directory_view::first_entry(uint32_t ino) const { return g_->first_dir_entry(ino); }