From d13ea51ae5aec5f656b95f7bd530474a3d928db3 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Sat, 24 Aug 2024 00:21:31 +0200 Subject: [PATCH] refactor(metadata_types): remove unused code --- include/dwarfs/reader/internal/metadata_types.h | 8 +------- src/reader/internal/metadata_types.cpp | 14 -------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/include/dwarfs/reader/internal/metadata_types.h b/include/dwarfs/reader/internal/metadata_types.h index 08f2d38e..f67b39ce 100644 --- a/include/dwarfs/reader/internal/metadata_types.h +++ b/include/dwarfs/reader/internal/metadata_types.h @@ -156,13 +156,7 @@ class dir_entry_view_impl { from_dir_entry_index(uint32_t self_index, global_metadata const& g, entry_name_type name_type = entry_name_type::other); - // TODO: this works, but it's strange; a limited version of - // dir_entry_view_impl - // should work without a parent for these use cases - static std::string - name(uint32_t index, global_metadata const& g); // TODO: remove? - static std::shared_ptr - inode_shared(uint32_t index, global_metadata const& g); // TODO: remove? + static std::string name(uint32_t index, global_metadata const& g); std::string name() const; std::shared_ptr inode_shared() const; diff --git a/src/reader/internal/metadata_types.cpp b/src/reader/internal/metadata_types.cpp index 2f14270f..15c93793 100644 --- a/src/reader/internal/metadata_types.cpp +++ b/src/reader/internal/metadata_types.cpp @@ -989,20 +989,6 @@ dir_entry_view_impl::name(uint32_t index, global_metadata const& g) { return std::string(g.meta().names()[iv.name_index_v2_2()]); } -std::shared_ptr -dir_entry_view_impl::inode_shared(uint32_t index, global_metadata const& g) { - if (auto de = g.meta().dir_entries()) { - DWARFS_CHECK(index < de->size(), "index out of range"); - auto dev = (*de)[index]; - return std::make_shared(g.meta().inodes()[dev.inode_num()], - dev.inode_num(), g.meta()); - } - - DWARFS_CHECK(index < g.meta().inodes().size(), "index out of range"); - auto iv = g.meta().inodes()[index]; - return std::make_shared(iv, iv.inode_v2_2(), g.meta()); -} - std::string dir_entry_view_impl::path() const { return u8string_to_string(fs_path().u8string()); }