GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-05-17 21:35:45 +02:00
Code Packages

fd: start deprecating vector<uint8_t> for p{read,write}_or_die

Browse Source 
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>
This commit is contained in:
Zygo Blaxell 2021-10-12 12:12:14 -04:00
parent bba6f4f183
commit 99709d889f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/crucible/fd.h
View File

@ -1,6 +1,7 @@
#ifndef CRUCIBLE_FD_H #ifndef CRUCIBLE_FD_H
#define CRUCIBLE_FD_H #define CRUCIBLE_FD_H
#include "crucible/bytevector.h"
#include "crucible/namedptr.h" #include "crucible/namedptr.h"
#include <cstring> #include <cstring>
@ -125,11 +126,14 @@ namespace crucible {
// Specialization for strings which reads/writes the string content, not the struct string // 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 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<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<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 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 // A different approach to reading a simple string
string read_string(int fd, size_t size); string read_string(int fd, size_t size);

4
lib/fd.cc
View File

@ -458,7 +458,7 @@ namespace crucible {
template<> template<>
void 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); return pread_or_die(fd, text.data(), text.size(), offset);
} }
@ -479,7 +479,7 @@ namespace crucible {
template<> template<>
void 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); return pwrite_or_die(fd, text.data(), text.size(), offset);
} }