drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[ox/fs] Replace uint8_t with char for buffers

Browse Source
This commit is contained in:
Gary Talent 2020-02-11 21:42:09 -06:00
parent 90f94dbfc2
commit 553cde0d0c
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/ox/src/ox/fs/filestore/filestoretemplate.hpp vendored
View File

@ -122,7 +122,7 @@ class FileStoreTemplate {
[[nodiscard]] InodeId_t available(); [[nodiscard]] InodeId_t available();
[[nodiscard]] uint8_t *buff(); [[nodiscard]] char *buff();
[[nodiscard]] Error walk(Error(*cb)(uint8_t, uint64_t, uint64_t)); [[nodiscard]] Error walk(Error(*cb)(uint8_t, uint64_t, uint64_t));
@ -464,8 +464,8 @@ typename FileStoreTemplate<size_t>::InodeId_t FileStoreTemplate<size_t>::availab
} }
template<typename size_t> template<typename size_t>
uint8_t *FileStoreTemplate<size_t>::buff() { char *FileStoreTemplate<size_t>::buff() {
return reinterpret_cast<uint8_t*>(m_buffer); return reinterpret_cast<char*>(m_buffer);
} }
template<typename size_t> template<typename size_t>

12
deps/ox/src/ox/fs/filesystem/filesystem.hpp vendored
View File

@ -70,7 +70,7 @@ class FileSystem {
[[nodiscard]] virtual uint64_t size() const = 0; [[nodiscard]] virtual uint64_t size() const = 0;
[[nodiscard]] virtual uint8_t *buff() = 0; [[nodiscard]] virtual char *buff() = 0;
[[nodiscard]] virtual ox::Error walk(ox::Error(*cb)(uint8_t, uint64_t, uint64_t)) = 0; [[nodiscard]] virtual ox::Error walk(ox::Error(*cb)(uint8_t, uint64_t, uint64_t)) = 0;
@ -94,12 +94,12 @@ class FileSystemTemplate: public FileSystem {
}; };
FileStore m_fs; FileStore m_fs;
void(*m_freeBuffer)(uint8_t*) = nullptr; void(*m_freeBuffer)(char*) = nullptr;
public: public:
FileSystemTemplate() = default; FileSystemTemplate() = default;
FileSystemTemplate(void *buffer, uint64_t bufferSize, void(*freeBuffer)(uint8_t*) = [] (uint8_t *buff) { delete buff; }); FileSystemTemplate(void *buffer, uint64_t bufferSize, void(*freeBuffer)(char*) = [] (char *buff) { delete buff; });
FileSystemTemplate(FileStore fs); FileSystemTemplate(FileStore fs);
@ -147,7 +147,7 @@ class FileSystemTemplate: public FileSystem {
uint64_t size() const override; uint64_t size() const override;
uint8_t *buff() override; char *buff() override;
[[nodiscard]] ox::Error walk(ox::Error(*cb)(uint8_t, uint64_t, uint64_t)) override; [[nodiscard]] ox::Error walk(ox::Error(*cb)(uint8_t, uint64_t, uint64_t)) override;
@ -171,7 +171,7 @@ FileSystemTemplate<FileStore, Directory>::FileSystemTemplate(FileStore fs) {
} }
template<typename FileStore, typename Directory> template<typename FileStore, typename Directory>
FileSystemTemplate<FileStore, Directory>::FileSystemTemplate(void *buffer, uint64_t bufferSize, void(*freeBuffer)(uint8_t*)): FileSystemTemplate<FileStore, Directory>::FileSystemTemplate(void *buffer, uint64_t bufferSize, void(*freeBuffer)(char*)):
m_fs(buffer, bufferSize), m_fs(buffer, bufferSize),
m_freeBuffer(freeBuffer) { m_freeBuffer(freeBuffer) {
} }
@ -363,7 +363,7 @@ uint64_t FileSystemTemplate<FileStore, Directory>::size() const {
} }
template<typename FileStore, typename Directory> template<typename FileStore, typename Directory>
uint8_t *FileSystemTemplate<FileStore, Directory>::buff() { char *FileSystemTemplate<FileStore, Directory>::buff() {
return m_fs.buff(); return m_fs.buff();
} }

2
deps/ox/src/ox/fs/filesystem/passthroughfs.cpp vendored
View File

@ -140,7 +140,7 @@ uint64_t PassThroughFS::size() const {
return s.capacity; return s.capacity;
} }
uint8_t *PassThroughFS::buff() { char *PassThroughFS::buff() {
return nullptr; return nullptr;
} }

2
deps/ox/src/ox/fs/filesystem/passthroughfs.hpp vendored
View File

@ -72,7 +72,7 @@ class PassThroughFS: public FileSystem {
uint64_t size() const override; uint64_t size() const override;
uint8_t *buff() override; char *buff() override;
ox::Error walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) override; ox::Error walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) override;