From a9b1f3fabe2d872e192041d660c8205924b41c7a Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Wed, 2 Dec 2020 13:00:28 +0100
Subject: [PATCH] Various small cleanups

---
 src/dwarfs/metadata_v2.cpp | 3 +--
 src/dwarfs/scanner.cpp     | 2 +-
 thrift/metadata.thrift     | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/dwarfs/metadata_v2.cpp b/src/dwarfs/metadata_v2.cpp
index edc8ddbc..037f1ff4 100644
--- a/src/dwarfs/metadata_v2.cpp
+++ b/src/dwarfs/metadata_v2.cpp
@@ -275,8 +275,7 @@ void metadata_<LoggerPolicy>::dump(
   auto count = dir.entry_count();
   auto first = dir.first_entry();
 
-  os << "(" << count << " entries) [" << dir.inode() << ", "
-     << dir.parent_inode() << "]\n";
+  os << " (" << count << " entries, parent=" << dir.parent_inode() << ")\n";
 
   for (size_t i = 0; i < count; ++i) {
     dump(os, indent, make_entry_view(first + i), detail_level, icb);
diff --git a/src/dwarfs/scanner.cpp b/src/dwarfs/scanner.cpp
index 203181bb..5492f94d 100644
--- a/src/dwarfs/scanner.cpp
+++ b/src/dwarfs/scanner.cpp
@@ -73,6 +73,7 @@ class scan_files_visitor : public visitor_base {
       , os_(os)
       , prog_(prog) {}
 
+  // TODO: avoid scanning hardlinks multiple times
   void visit(file* p) override {
     wg_.add_job([=] {
       prog_.current.store(p);
@@ -191,7 +192,6 @@ class save_directories_visitor : public visitor_base {
     thrift::metadata::directory dummy;
     dummy.parent_inode = 0;
     dummy.first_entry = mv2.entries.size();
-    // dummy.entry_count = 0;
     mv2.directories.push_back(dummy);
   }
 
diff --git a/thrift/metadata.thrift b/thrift/metadata.thrift
index cc072c43..54fd121e 100644
--- a/thrift/metadata.thrift
+++ b/thrift/metadata.thrift
@@ -150,8 +150,8 @@ struct metadata {
    *********************************************************/
 
    // block size
-  15: required UInt32          block_size;
+  15: required UInt32          block_size,
 
    // total file system size
-  16: required UInt64          total_fs_size;
+  16: required UInt64          total_fs_size,
 }