refactor(dwarfsextract): use filesystem_v2_lite

Author: mhx

include/dwarfs/utility/filesystem_extractor.h

@@ -44,7 +44,7 @@ class os_access;
 
 namespace reader {
 
-class filesystem_v2;
+class filesystem_v2_lite;
 
 }
 
@@ -77,15 +77,16 @@ class filesystem_extractor {
 
   void close() { impl_->close(); }
 
-  bool extract(reader::filesystem_v2 const& fs,
+  bool extract(reader::filesystem_v2_lite const& fs,
                filesystem_extractor_options const& opts =
                    filesystem_extractor_options()) {
     return impl_->extract(fs, nullptr, opts);
   }
 
-  bool extract(reader::filesystem_v2 const& fs, glob_matcher const* matcher,
-               filesystem_extractor_options const& opts =
-                   filesystem_extractor_options()) {
+  bool
+  extract(reader::filesystem_v2_lite const& fs, glob_matcher const* matcher,
+          filesystem_extractor_options const& opts =
+              filesystem_extractor_options()) {
     return impl_->extract(fs, matcher, opts);
   }
 
@@ -99,7 +100,7 @@ class filesystem_extractor {
     virtual void open_disk(std::filesystem::path const& output) = 0;
     virtual void close() = 0;
     virtual bool
-    extract(reader::filesystem_v2 const& fs, glob_matcher const* matcher,
+    extract(reader::filesystem_v2_lite const& fs, glob_matcher const* matcher,
             filesystem_extractor_options const& opts) = 0;
   };
 

src/utility/filesystem_extractor.cpp

@@ -198,8 +198,9 @@ class filesystem_extractor_ final : public filesystem_extractor::impl {
     }
   }
 
-  bool extract(reader::filesystem_v2 const& fs, glob_matcher const* matcher,
-               filesystem_extractor_options const& opts) override;
+  bool
+  extract(reader::filesystem_v2_lite const& fs, glob_matcher const* matcher,
+          filesystem_extractor_options const& opts) override;
 
  private:
   void closefd(int& fd) {
@@ -260,7 +261,7 @@ class filesystem_extractor_ final : public filesystem_extractor::impl {
 
 template <typename LoggerPolicy>
 bool filesystem_extractor_<LoggerPolicy>::extract(
-    reader::filesystem_v2 const& fs, glob_matcher const* matcher,
+    reader::filesystem_v2_lite const& fs, glob_matcher const* matcher,
     filesystem_extractor_options const& opts) {
   DWARFS_CHECK(a_, "filesystem not opened");
 

tools/src/dwarfsextract_main.cpp

@@ -191,7 +191,7 @@ int dwarfsextract_main(int argc, sys_char** argv, iolayer const& iol) {
     std::shared_ptr<performance_monitor> perfmon = performance_monitor::create(
         perfmon_enabled, iol.file, perfmon_trace_file);
 
-    reader::filesystem_v2 fs(lgr, *iol.os, fs_image, fsopts, perfmon);
+    reader::filesystem_v2_lite fs(lgr, *iol.os, fs_image, fsopts, perfmon);
     utility::filesystem_extractor fsx(lgr, *iol.os);
 
     if (format.empty()) {