Rename storage::CacheEntryWriter to EntryWriter

diff --git a/src/storage/Storage.cpp b/src/storage/Storage.cpp
index 81d30586b8a84270ac516fab579c4205e0387d1e..51b51b7c26b884ffb58603a30aa1445b7d0690de 100644 (file)
--- a/src/storage/Storage.cpp
+++ b/src/storage/Storage.cpp
@@ -218,7 +218,7 @@ Storage::get(const Digest& key, const core::CacheEntryType type)
 bool
 Storage::put(const Digest& key,
              const core::CacheEntryType type,
-             const storage::CacheEntryWriter& entry_writer)
+             const storage::EntryWriter& entry_writer)
 {
   const auto path = m_primary_storage.put(key, type, entry_writer);
   if (!path) {

diff --git a/src/storage/Storage.hpp b/src/storage/Storage.hpp
index 54640d666d56ec582bd77611c8f7f106b1ba1c23..511a2b0dcc12bacc0b24096cbe24656cb41b1256 100644 (file)
--- a/src/storage/Storage.hpp
+++ b/src/storage/Storage.hpp
@@ -55,7 +55,7 @@ public:
 
   bool put(const Digest& key,
            core::CacheEntryType type,
-           const storage::CacheEntryWriter& entry_writer);
+           const storage::EntryWriter& entry_writer);
 
   void remove(const Digest& key, core::CacheEntryType type);
 

diff --git a/src/storage/primary/PrimaryStorage.cpp b/src/storage/primary/PrimaryStorage.cpp
index f5022693cacbe3d1f06c84e551efeb44b71cb9f4..c4e29cf13426d77c7e177428937ea54df590fa61 100644 (file)
--- a/src/storage/primary/PrimaryStorage.cpp
+++ b/src/storage/primary/PrimaryStorage.cpp
@@ -199,7 +199,7 @@ PrimaryStorage::get(const Digest& key, const core::CacheEntryType type) const
 nonstd::optional<std::string>
 PrimaryStorage::put(const Digest& key,
                     const core::CacheEntryType type,
-                    const storage::CacheEntryWriter& entry_writer)
+                    const storage::EntryWriter& entry_writer)
 {
   const auto cache_file = look_up_cache_file(key, type);
   switch (type) {

diff --git a/src/storage/primary/PrimaryStorage.hpp b/src/storage/primary/PrimaryStorage.hpp
index 097002e0bb44269c0e52a5195d2b4dc92654f190..e1d5620d943fbcf07c0b8ab33c8b04fc644f2772 100644 (file)
--- a/src/storage/primary/PrimaryStorage.hpp
+++ b/src/storage/primary/PrimaryStorage.hpp
@@ -43,10 +43,9 @@ public:
   nonstd::optional<std::string> get(const Digest& key,
                                     core::CacheEntryType type) const;
 
-  nonstd::optional<std::string>
-  put(const Digest& key,
-      core::CacheEntryType type,
-      const storage::CacheEntryWriter& entry_writer);
+  nonstd::optional<std::string> put(const Digest& key,
+                                    core::CacheEntryType type,
+                                    const storage::EntryWriter& entry_writer);
 
   void remove(const Digest& key, core::CacheEntryType type);
 

diff --git a/src/storage/types.hpp b/src/storage/types.hpp
index 974cafa6bd4dd32c3ededa3155374f2b2eef2ecf..16e70cd765a71ceaf6e320a94ce0744ec4732ee9 100644 (file)
--- a/src/storage/types.hpp
+++ b/src/storage/types.hpp
@@ -23,6 +23,6 @@
 
 namespace storage {
 
-using CacheEntryWriter = std::function<bool(const std::string& path)>;
+using EntryWriter = std::function<bool(const std::string& path)>;
 
 } // namespace storage