drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Replace file store version field with type field

Browse Source 
Replaced file store version field with type field to allow a family of differing file store formats.
This commit is contained in:
Gary Talent
2016-07-02 02:28:45 -05:00
parent e2781ac743
commit 3c33f912af
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ox/fs/filestore.hpp
+4 -4
View File
@@ -46,7 +46,7 @@ class FileStore {
Inode() = default; Inode() = default;
}; };
uint32_t m_version; uint32_t m_fsType;
FsSize_t m_size; FsSize_t m_size;
FsSize_t m_firstInode; FsSize_t m_firstInode;
FsSize_t m_rootInode; FsSize_t m_rootInode;
@@ -94,7 +94,7 @@ class FileStore {
static uint8_t version(); static uint8_t version();
static uint8_t *format(uint8_t *buffer, FsSize_t size); static uint8_t *format(uint8_t *buffer, FsSize_t size, uint32_t fsType = 0);
private: private:
/** /**
@@ -328,11 +328,11 @@ uint8_t FileStore<FsSize_t>::version() {
}; };
template<typename FsSize_t> template<typename FsSize_t>
uint8_t *FileStore<FsSize_t>::format(uint8_t *buffer, FsSize_t size) { uint8_t *FileStore<FsSize_t>::format(uint8_t *buffer, FsSize_t size, uint32_t fsType) {
memset(buffer, 0, size); memset(buffer, 0, size);
auto *fs = (FileStore*) buffer; auto *fs = (FileStore*) buffer;
fs->m_version = FileStore<FsSize_t>::version(); fs->m_fsType = fsType;
fs->m_size = size; fs->m_size = size;
fs->m_rootInode = sizeof(FileStore<FsSize_t>); fs->m_rootInode = sizeof(FileStore<FsSize_t>);
fs->m_firstInode = sizeof(FileStore<FsSize_t>); fs->m_firstInode = sizeof(FileStore<FsSize_t>);