From 99709d889f14ef86b38014a50d4d2580909316f1 Mon Sep 17 00:00:00 2001
From: Zygo Blaxell <bees@furryterror.org>
Date: Tue, 12 Oct 2021 12:12:14 -0400
Subject: [PATCH] fd: start deprecating vector<uint8_t> for
 p{read,write}_or_die

Add support for pread and pwrite of ByteVector objects alongside
vector<uint8_t>.  A later commit will delete the template specializations
for vector<uint8_t>, but existing users have to be updated to use
ByteVector first.

Nothing currently uses vector<char>, so we can delete that immediately.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>
---
 include/crucible/fd.h | 10 +++++++---
 lib/fd.cc             |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/crucible/fd.h b/include/crucible/fd.h
index ff390aa..89eec2e 100644
--- a/include/crucible/fd.h
+++ b/include/crucible/fd.h
@@ -1,6 +1,7 @@
 #ifndef CRUCIBLE_FD_H
 #define CRUCIBLE_FD_H
 
+#include "crucible/bytevector.h"
 #include "crucible/namedptr.h"
 
 #include <cstring>
@@ -125,11 +126,14 @@ namespace crucible {
 	// Specialization for strings which reads/writes the string content, not the struct string
 	template<> void write_or_die<string>(int fd, const string& str);
 	template<> void pread_or_die<string>(int fd, string& str, off_t offset);
-	template<> void pread_or_die<vector<char>>(int fd, vector<char>& str, off_t offset);
-	template<> void pread_or_die<vector<uint8_t>>(int fd, vector<uint8_t>& str, off_t offset);
 	template<> void pwrite_or_die<string>(int fd, const string& str, off_t offset);
-	template<> void pwrite_or_die<vector<char>>(int fd, const vector<char>& str, off_t offset);
+	template<> void pread_or_die<ByteVector>(int fd, ByteVector& str, off_t offset);
+	template<> void pwrite_or_die<ByteVector>(int fd, const ByteVector& str, off_t offset);
+	// Deprecated
+	template<> void pread_or_die<vector<uint8_t>>(int fd, vector<uint8_t>& str, off_t offset);
 	template<> void pwrite_or_die<vector<uint8_t>>(int fd, const vector<uint8_t>& str, off_t offset);
+	template<> void pread_or_die<vector<char>>(int fd, vector<char>& str, off_t offset) = delete;
+	template<> void pwrite_or_die<vector<char>>(int fd, const vector<char>& str, off_t offset) = delete;
 
 	// A different approach to reading a simple string
 	string read_string(int fd, size_t size);
diff --git a/lib/fd.cc b/lib/fd.cc
index cbedda2..bc32485 100644
--- a/lib/fd.cc
+++ b/lib/fd.cc
@@ -458,7 +458,7 @@ namespace crucible {
 
 	template<>
 	void
-	pread_or_die<vector<char>>(int fd, vector<char> &text, off_t offset)
+	pread_or_die<ByteVector>(int fd, ByteVector &text, off_t offset)
 	{
 		return pread_or_die(fd, text.data(), text.size(), offset);
 	}
@@ -479,7 +479,7 @@ namespace crucible {
 
 	template<>
 	void
-	pwrite_or_die<vector<char>>(int fd, const vector<char> &text, off_t offset)
+	pwrite_or_die<ByteVector>(int fd, const ByteVector &text, off_t offset)
 	{
 		return pwrite_or_die(fd, text.data(), text.size(), offset);
 	}