From be348451c73090bc9625131adaaf13e3f2e404a4 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Tue, 15 Apr 2025 14:17:05 +0200
Subject: [PATCH] refactor: make `block_cache_byte_buffer_factory` internal

---
 cmake/libdwarfs.cmake                                    | 2 +-
 .../{ => internal}/block_cache_byte_buffer_factory.h     | 4 ++--
 src/reader/internal/block_cache.cpp                      | 2 +-
 .../{ => internal}/block_cache_byte_buffer_factory.cpp   | 9 +++++----
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename include/dwarfs/reader/{ => internal}/block_cache_byte_buffer_factory.h (95%)
 rename src/reader/{ => internal}/block_cache_byte_buffer_factory.cpp (96%)

diff --git a/cmake/libdwarfs.cmake b/cmake/libdwarfs.cmake
index a68f38a6..cbc6c3af 100644
--- a/cmake/libdwarfs.cmake
+++ b/cmake/libdwarfs.cmake
@@ -91,7 +91,6 @@ add_library(
 add_library(
   dwarfs_reader
 
-  src/reader/block_cache_byte_buffer_factory.cpp
   src/reader/block_cache_options.cpp
   src/reader/block_range.cpp
   src/reader/filesystem_options.cpp
@@ -101,6 +100,7 @@ add_library(
   src/reader/mlock_mode.cpp
 
   src/reader/internal/block_cache.cpp
+  src/reader/internal/block_cache_byte_buffer_factory.cpp
   src/reader/internal/cached_block.cpp
   src/reader/internal/filesystem_parser.cpp
   src/reader/internal/inode_reader_v2.cpp
diff --git a/include/dwarfs/reader/block_cache_byte_buffer_factory.h b/include/dwarfs/reader/internal/block_cache_byte_buffer_factory.h
similarity index 95%
rename from include/dwarfs/reader/block_cache_byte_buffer_factory.h
rename to include/dwarfs/reader/internal/block_cache_byte_buffer_factory.h
index 295a0dc6..2054ced6 100644
--- a/include/dwarfs/reader/block_cache_byte_buffer_factory.h
+++ b/include/dwarfs/reader/internal/block_cache_byte_buffer_factory.h
@@ -32,7 +32,7 @@
 
 #include <dwarfs/reader/block_cache_options.h>
 
-namespace dwarfs::reader {
+namespace dwarfs::reader::internal {
 
 class block_cache_byte_buffer_factory {
  public:
@@ -40,4 +40,4 @@ class block_cache_byte_buffer_factory {
   static byte_buffer_factory create(block_cache_allocation_mode mode);
 };
 
-} // namespace dwarfs::reader
+} // namespace dwarfs::reader::internal
diff --git a/src/reader/internal/block_cache.cpp b/src/reader/internal/block_cache.cpp
index d5ccd31a..ec424ae2 100644
--- a/src/reader/internal/block_cache.cpp
+++ b/src/reader/internal/block_cache.cpp
@@ -52,7 +52,6 @@
 #include <dwarfs/logger.h>
 #include <dwarfs/mmif.h>
 #include <dwarfs/performance_monitor.h>
-#include <dwarfs/reader/block_cache_byte_buffer_factory.h>
 #include <dwarfs/reader/block_cache_options.h>
 #include <dwarfs/reader/cache_tidy_config.h>
 #include <dwarfs/scope_exit.h>
@@ -61,6 +60,7 @@
 #include <dwarfs/internal/fs_section.h>
 #include <dwarfs/internal/worker_group.h>
 #include <dwarfs/reader/internal/block_cache.h>
+#include <dwarfs/reader/internal/block_cache_byte_buffer_factory.h>
 #include <dwarfs/reader/internal/cached_block.h>
 
 namespace dwarfs::reader::internal {
diff --git a/src/reader/block_cache_byte_buffer_factory.cpp b/src/reader/internal/block_cache_byte_buffer_factory.cpp
similarity index 96%
rename from src/reader/block_cache_byte_buffer_factory.cpp
rename to src/reader/internal/block_cache_byte_buffer_factory.cpp
index b8587073..50a6c1e3 100644
--- a/src/reader/block_cache_byte_buffer_factory.cpp
+++ b/src/reader/internal/block_cache_byte_buffer_factory.cpp
@@ -38,9 +38,10 @@
 #endif
 
 #include <dwarfs/malloc_byte_buffer.h>
-#include <dwarfs/reader/block_cache_byte_buffer_factory.h>
 
-namespace dwarfs::reader {
+#include <dwarfs/reader/internal/block_cache_byte_buffer_factory.h>
+
+namespace dwarfs::reader::internal {
 
 namespace {
 
@@ -160,7 +161,7 @@ class mmap_byte_buffer_impl : public mutable_byte_buffer_interface {
     size_ += size;
   }
 
-  internal::malloc_buffer& raw_buffer() override {
+  dwarfs::internal::malloc_buffer& raw_buffer() override {
     throw std::runtime_error(
         "operation not allowed on mmap buffer: raw_buffer");
   }
@@ -206,4 +207,4 @@ block_cache_byte_buffer_factory::create(block_cache_allocation_mode mode) {
       std::make_shared<block_cache_byte_buffer_factory_impl>(mode)};
 }
 
-} // namespace dwarfs::reader
+} // namespace dwarfs::reader::internal