From 8727cffdf192b176a43e52141a86ab0a9b8d3983 Mon Sep 17 00:00:00 2001
From: Per Larsson <p3rl@protonmail.com>
Date: Tue, 28 Sep 2021 15:08:37 +0200
Subject: Removed using the bucket name to detect binary cache records and
 store content type in cache.

---
 zencore/include/zencore/iobuffer.h | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'zencore')

diff --git a/zencore/include/zencore/iobuffer.h b/zencore/include/zencore/iobuffer.h
index 6ee40e468..21751cd40 100644
--- a/zencore/include/zencore/iobuffer.h
+++ b/zencore/include/zencore/iobuffer.h
@@ -26,6 +26,35 @@ enum class ZenContentType : uint8_t
 	kCOUNT
 };
 
+inline std::string_view
+ToString(ZenContentType ContentType)
+{
+	using namespace std::literals;
+
+	switch (ContentType)
+	{
+		default:
+		case ZenContentType::kUnknownContentType:
+			return "unknown"sv;
+		case ZenContentType::kBinary:
+			return "binary"sv;
+		case ZenContentType::kText:
+			return "text"sv;
+		case ZenContentType::kJSON:
+			return "json"sv;
+		case ZenContentType::kCbObject:
+			return "cb-object"sv;
+		case ZenContentType::kCbPackage:
+			return "cb-package"sv;
+		case ZenContentType::kCbPackageOffer:
+			return "cb-package-offer"sv;
+		case ZenContentType::kCompressedBinary:
+			return "compressed-binary"sv;
+		case ZenContentType::kYAML:
+			return "yaml"sv;
+	}
+}
+
 struct IoBufferFileReference
 {
 	void*	 FileHandle;
-- 
cgit v1.2.3


From eaa6004f224c4588352d9b3cd669faa1f9f52d7d Mon Sep 17 00:00:00 2001
From: Per Larsson <p3rl@protonmail.com>
Date: Tue, 28 Sep 2021 15:51:48 +0200
Subject: Removed null terminator when appending Oid to string builder. (#11)

---
 zencore/uid.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'zencore')

diff --git a/zencore/uid.cpp b/zencore/uid.cpp
index d4b708288..86cdfae3a 100644
--- a/zencore/uid.cpp
+++ b/zencore/uid.cpp
@@ -99,11 +99,10 @@ Oid::ToString(char OutString[StringLength])
 StringBuilderBase&
 Oid::ToString(StringBuilderBase& OutString) const
 {
-	char str[StringLength + 1];
-	ToHexBytes(reinterpret_cast<const uint8_t*>(OidBits), sizeof(Oid::OidBits), str);
-	str[2 * sizeof(Oid)] = '\0';
+	String_t Str;
+	ToHexBytes(reinterpret_cast<const uint8_t*>(OidBits), sizeof(Oid::OidBits), Str);
 
-	OutString.AppendRange(str, &str[25]);
+	OutString.AppendRange(Str, &Str[StringLength]);
 
 	return OutString;
 }
-- 
cgit v1.2.3