From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 6 Nov 2021 18:44:52 +0000 (+0100)
Subject: refactor: Rename tag header field to namespace
X-Git-Tag: v4.5~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bc2be8f34649cda12e637faeaedd88d52c22f89;p=thirdparty%2Fccache.git

refactor: Rename tag header field to namespace
---

diff --git a/src/core/CacheEntryHeader.cpp b/src/core/CacheEntryHeader.cpp
index e29ce801d..64e085736 100644
--- a/src/core/CacheEntryHeader.cpp
+++ b/src/core/CacheEntryHeader.cpp
@@ -30,7 +30,7 @@ const size_t k_static_header_fields_size =
   + sizeof(core::CacheEntryHeader::entry_size)
   // ccache_version length field:
   + 1
-  // tag length field:
+  // namespace_ length field:
   + 1;
 
 const size_t k_static_epilogue_fields_size =
@@ -43,7 +43,7 @@ CacheEntryHeader::CacheEntryHeader(const core::CacheEntryType entry_type_,
                                    const int8_t compression_level_,
                                    const uint64_t creation_time_,
                                    const std::string& ccache_version_,
-                                   const std::string& tag_,
+                                   const std::string& namespace_arg,
                                    const uint64_t entry_size_)
   : magic(k_ccache_magic),
     entry_format_version(k_entry_format_version),
@@ -52,7 +52,7 @@ CacheEntryHeader::CacheEntryHeader(const core::CacheEntryType entry_type_,
     compression_level(compression_level_),
     creation_time(creation_time_),
     ccache_version(ccache_version_),
-    tag(tag_),
+    namespace_(namespace_arg),
     entry_size(entry_size_)
 {
 }
@@ -81,15 +81,15 @@ CacheEntryHeader::dump(FILE* const stream) const
   PRINT(stream, "Compression level: {}\n", compression_level);
   PRINT(stream, "Creation time: {}\n", creation_time);
   PRINT(stream, "Ccache version: {}\n", ccache_version);
-  PRINT(stream, "Tag: {}\n", tag);
+  PRINT(stream, "Namespace: {}\n", namespace_);
   PRINT(stream, "Entry size: {}\n", entry_size);
 }
 
 size_t
 CacheEntryHeader::non_payload_size() const
 {
-  return k_static_header_fields_size + ccache_version.length() + tag.length()
-         + k_static_epilogue_fields_size;
+  return k_static_header_fields_size + ccache_version.length()
+         + namespace_.length() + k_static_epilogue_fields_size;
 }
 
 } // namespace core
diff --git a/src/core/CacheEntryHeader.hpp b/src/core/CacheEntryHeader.hpp
index cbbb7b43e..01fc0bdd5 100644
--- a/src/core/CacheEntryHeader.hpp
+++ b/src/core/CacheEntryHeader.hpp
@@ -28,7 +28,7 @@
 //
 // <entry>            ::= <header> <payload> <epilogue>
 // <header>           ::= <magic> <format_ver> <entry_type> <compr_type>
-//                        <compr_level> <creation_time> <ccache_ver> <tag>
+//                        <compr_level> <creation_time> <ccache_ver> <namespace>
 //                        <entry_size>
 // <magic>            ::= uint16_t (0xccac)
 // <format_ver>       ::= uint8_t
@@ -41,7 +41,7 @@
 // <compr_level>      ::= int8_t
 // <creation_time>    ::= uint64_t (Unix epoch time when entry was created)
 // <ccache_ver>       ::= string length (uint8_t) + string data
-// <tag>              ::= string length (uint8_t) + string data
+// <namespace>        ::= string length (uint8_t) + string data
 // <entry_size>       ::= uint64_t ; = size of file if stored uncompressed
 // ; potentially compressed from here
 // <payload>          ::= depends on entry_type
@@ -61,7 +61,7 @@ struct CacheEntryHeader
                    int8_t compression_level,
                    uint64_t creation_time,
                    const std::string& ccache_version,
-                   const std::string& tag,
+                   const std::string& namespace_,
                    uint64_t entry_size = 0);
 
   uint16_t magic;
@@ -71,7 +71,7 @@ struct CacheEntryHeader
   int8_t compression_level;
   uint64_t creation_time;
   std::string ccache_version;
-  std::string tag;
+  std::string namespace_;
   uint64_t entry_size;
 
   uint64_t payload_size() const;
diff --git a/src/core/CacheEntryWriter.cpp b/src/core/CacheEntryWriter.cpp
index b09b4c837..1715b09fb 100644
--- a/src/core/CacheEntryWriter.cpp
+++ b/src/core/CacheEntryWriter.cpp
@@ -37,8 +37,8 @@ CacheEntryWriter::CacheEntryWriter(core::Writer& writer,
   m_checksumming_writer.write_int(header.creation_time);
   m_checksumming_writer.write_int<uint8_t>(header.ccache_version.length());
   m_checksumming_writer.write_str(header.ccache_version);
-  m_checksumming_writer.write_int<uint8_t>(header.tag.length());
-  m_checksumming_writer.write_str(header.tag);
+  m_checksumming_writer.write_int<uint8_t>(header.namespace_.length());
+  m_checksumming_writer.write_str(header.namespace_);
   m_checksumming_writer.write_int(header.entry_size);
 
   m_checksumming_writer.set_writer(*m_compressor);