diff --git a/include/nx/fs.hpp b/include/nx/fs.hpp index 04deece..e72a77f 100755 --- a/include/nx/fs.hpp +++ b/include/nx/fs.hpp @@ -53,7 +53,7 @@ namespace nx::fs ~IFile(); void Read(u64 offset, void* buf, size_t size); - u64 GetSize(); + s64 GetSize(); }; class IDirectory @@ -72,7 +72,7 @@ namespace nx::fs ~IDirectory(); - void Read(u64 inval, FsDirectoryEntry* buf, size_t numEntries); + void Read(s64 inval, FsDirectoryEntry* buf, size_t numEntries); u64 GetEntryCount(); }; diff --git a/source/nx/fs.cpp b/source/nx/fs.cpp index a7d55ec..c014b6d 100755 --- a/source/nx/fs.cpp +++ b/source/nx/fs.cpp @@ -51,9 +51,9 @@ namespace nx::fs } } - u64 IFile::GetSize() + s64 IFile::GetSize() { - u64 sizeOut; + s64 sizeOut; ASSERT_OK(fsFileGetSize(&m_file, &sizeOut), "Failed to get file size"); return sizeOut; } @@ -71,10 +71,9 @@ namespace nx::fs fsDirClose(&m_dir); } - void IDirectory::Read(u64 inval, FsDirectoryEntry* buf, size_t numEntries) + void IDirectory::Read(s64 inval, FsDirectoryEntry* buf, size_t numEntries) { - size_t entriesRead; - ASSERT_OK(fsDirRead(&m_dir, inval, &entriesRead, numEntries, buf), "Failed to read directory"); + ASSERT_OK(fsDirRead(&m_dir, &inval, numEntries, buf), "Failed to read directory"); /*if (entriesRead != numEntries) { @@ -85,7 +84,7 @@ namespace nx::fs u64 IDirectory::GetEntryCount() { - u64 entryCount = 0; + s64 entryCount = 0; ASSERT_OK(fsDirGetEntryCount(&m_dir, &entryCount), "Failed to get entry count"); return entryCount; }