Put the current inode space usage back into the spaceNeeded method
This commit is contained in:
@@ -571,12 +571,7 @@ typename FileStore<Header>::StatInfo FileStore<Header>::stat(InodeId_t id) {
|
|||||||
|
|
||||||
template<typename Header>
|
template<typename Header>
|
||||||
typename Header::FsSize_t FileStore<Header>::spaceNeeded(InodeId_t id, typename Header::FsSize_t size) {
|
typename Header::FsSize_t FileStore<Header>::spaceNeeded(InodeId_t id, typename Header::FsSize_t size) {
|
||||||
typename Header::FsSize_t needed = sizeof(Inode) + size;;
|
return sizeof(Inode) + size;
|
||||||
auto inode = getInode(ptr<Inode*>(m_header.getRootInode()), id);
|
|
||||||
if (inode) {
|
|
||||||
needed -= inode->size();
|
|
||||||
}
|
|
||||||
return needed;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename Header>
|
template<typename Header>
|
||||||
|
|||||||
@@ -30,8 +30,7 @@ const static auto usage = "usage:\n"
|
|||||||
"\toxfs compact <FS file>\n"
|
"\toxfs compact <FS file>\n"
|
||||||
"\toxfs version\n";
|
"\toxfs version\n";
|
||||||
|
|
||||||
char *loadFileBuff(const char *path, ::size_t *sizeOut = nullptr) {
|
char *loadFileBuff(FILE *file, ::size_t *sizeOut = nullptr) {
|
||||||
auto file = fopen(path, "rb");
|
|
||||||
if (file) {
|
if (file) {
|
||||||
fseek(file, 0, SEEK_END);
|
fseek(file, 0, SEEK_END);
|
||||||
const auto size = ftell(file);
|
const auto size = ftell(file);
|
||||||
@@ -48,6 +47,10 @@ char *loadFileBuff(const char *path, ::size_t *sizeOut = nullptr) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char *loadFileBuff(const char *path, ::size_t *sizeOut = nullptr) {
|
||||||
|
return loadFileBuff(fopen(path, "rb"), sizeOut);
|
||||||
|
}
|
||||||
|
|
||||||
size_t bytes(const char *str) {
|
size_t bytes(const char *str) {
|
||||||
auto size = ::ox_strlen(str);
|
auto size = ::ox_strlen(str);
|
||||||
const auto lastChar = str[size-1];
|
const auto lastChar = str[size-1];
|
||||||
|
|||||||
Reference in New Issue
Block a user