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

[ox/fs] Remove completely pointless uses of ox_malloca

Browse Source
This commit is contained in:
Gary Talent 2018-09-01 01:16:37 -05:00
parent e918f2e60e
commit 9472043d80
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
deps/ox/src/ox/fs/filesystem2/filesystem.hpp vendored
View File

@ -96,8 +96,8 @@ Error FileSystemTemplate<InodeId_t>::format() {
oxReturnError(m_fs->format()); oxReturnError(m_fs->format());
constexpr auto rootDirInode = MaxValue<InodeId_t> / 2; constexpr auto rootDirInode = MaxValue<InodeId_t> / 2;
auto rootDir = ox_malloca(sizeof(ox::fs::Directory<InodeId_t>), ox::fs::Directory<InodeId_t>, m_fs, rootDirInode); Directory<InodeId_t> rootDir(m_fs, rootDirInode);
oxReturnError(rootDir->init()); oxReturnError(rootDir.init());
FileSystemData fd; FileSystemData fd;
fd.rootDirInode = rootDirInode; fd.rootDirInode = rootDirInode;
@ -116,8 +116,8 @@ Error FileSystemTemplate<InodeId_t>::mkdir(const char *path, bool recursive) {
auto fd = fileSystemData(); auto fd = fileSystemData();
if (fd.ok()) { if (fd.ok()) {
oxTrace("ox::fs::FileSystemTemplate::mkdir") << "rootDirInode:" << fd.value.rootDirInode; oxTrace("ox::fs::FileSystemTemplate::mkdir") << "rootDirInode:" << fd.value.rootDirInode;
auto rootDir = ox_malloca(sizeof(ox::fs::Directory<InodeId_t>), ox::fs::Directory<InodeId_t>, m_fs, fd.value.rootDirInode); Directory<InodeId_t> rootDir(m_fs, fd.value.rootDirInode);
return rootDir->mkdir(path, recursive); return rootDir.mkdir(path, recursive);
} else { } else {
oxLogError(fd.error); oxLogError(fd.error);
return fd.error; return fd.error;
@ -128,11 +128,11 @@ template<typename InodeId_t>
Error FileSystemTemplate<InodeId_t>::move(const char *src, const char *dest) { Error FileSystemTemplate<InodeId_t>::move(const char *src, const char *dest) {
auto fd = fileSystemData(); auto fd = fileSystemData();
oxReturnError(fd.error); oxReturnError(fd.error);
auto rootDir = ox_malloca(sizeof(ox::fs::Directory<InodeId_t>), ox::fs::Directory<InodeId_t>, m_fs, fd.value.rootDirInode); Directory<InodeId_t> rootDir(m_fs, fd.value.rootDirInode);
auto inode = rootDir->find(src); auto inode = rootDir.find(src);
oxReturnError(inode.error); oxReturnError(inode.error);
oxReturnError(rootDir->write(dest, inode)); oxReturnError(rootDir.write(dest, inode));
oxReturnError(rootDir->remove(src)); oxReturnError(rootDir.remove(src));
return OxError(0); return OxError(0);
} }
@ -140,8 +140,8 @@ template<typename InodeId_t>
Error FileSystemTemplate<InodeId_t>::read(const char *path, void *buffer, std::size_t buffSize) { Error FileSystemTemplate<InodeId_t>::read(const char *path, void *buffer, std::size_t buffSize) {
auto fd = fileSystemData(); auto fd = fileSystemData();
oxReturnError(fd.error); oxReturnError(fd.error);
auto rootDir = ox_malloca(sizeof(ox::fs::Directory<InodeId_t>), ox::fs::Directory<InodeId_t>, m_fs, fd.value.rootDirInode); Directory<InodeId_t> rootDir(m_fs, fd.value.rootDirInode);
auto inode = rootDir->find(path); auto inode = rootDir.find(path);
oxReturnError(inode.error); oxReturnError(inode.error);
return read(inode, buffer, buffSize); return read(inode, buffer, buffSize);
} }
@ -160,15 +160,15 @@ template<typename InodeId_t>
Error FileSystemTemplate<InodeId_t>::remove(const char *path, bool recursive) { Error FileSystemTemplate<InodeId_t>::remove(const char *path, bool recursive) {
auto fd = fileSystemData(); auto fd = fileSystemData();
oxReturnError(fd.error); oxReturnError(fd.error);
auto rootDir = ox_malloca(sizeof(ox::fs::Directory<InodeId_t>), ox::fs::Directory<InodeId_t>, m_fs, fd.value.rootDirInode); Directory<InodeId_t> rootDir(m_fs, fd.value.rootDirInode);
auto inode = rootDir->find(path); auto inode = rootDir.find(path);
oxReturnError(inode.error); oxReturnError(inode.error);
auto st = stat(inode); auto st = stat(inode);
oxReturnError(st.error); oxReturnError(st.error);
if (st.value.fileType == FileType_NormalFile || recursive) { if (st.value.fileType == FileType_NormalFile || recursive) {
if (auto err = rootDir->remove(path)) { if (auto err = rootDir.remove(path)) {
// removal failed, try putting the index back // removal failed, try putting the index back
oxLogError(rootDir->write(path, inode)); oxLogError(rootDir.write(path, inode));
return err; return err;
} }
} else { } else {
@ -255,8 +255,8 @@ template<typename InodeId_t>
ValErr<uint64_t> FileSystemTemplate<InodeId_t>::find(const char *path) { ValErr<uint64_t> FileSystemTemplate<InodeId_t>::find(const char *path) {
auto fd = fileSystemData(); auto fd = fileSystemData();
oxReturnError(fd.error); oxReturnError(fd.error);
auto rootDir = ox_malloca(sizeof(ox::fs::Directory<InodeId_t>), ox::fs::Directory<InodeId_t>, m_fs, fd.value.rootDirInode); Directory<InodeId_t> rootDir(m_fs, fd.value.rootDirInode);
auto inode = rootDir->find(path); auto inode = rootDir.find(path);
oxReturnError(inode.error); oxReturnError(inode.error);
return inode.value; return inode.value;
} }