prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More changes

Browse Source
This commit is contained in:
Zach Hilman
2018-06-20 19:28:48 -04:00
parent 0144efa0c2
commit e6ebc8fdc2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/file_sys/vfs_offset.cpp
View File

@@ -6,8 +6,8 @@
namespace FileSys { namespace FileSys {
OffsetVfsFile::OffsetVfsFile(VfsFile&& file, u64 offset, u64 size) OffsetVfsFile::OffsetVfsFile(std::unique_ptr<VfsFile>&& file, u64 offset, u64 size)
: file(std::make_unique<VfsFile>(file)), offset(offset), size(size) {} : file(std::move(file)), offset(offset), size(size) {}
bool OffsetVfsFile::IsReady() { bool OffsetVfsFile::IsReady() {
return file->IsReady(); return file->IsReady();
@@ -57,7 +57,7 @@ std::vector<u8> OffsetVfsFile::ReadBytes(u64 r_offset, u64 r_length) {
u64 OffsetVfsFile::WriteBytes(const std::vector<u8>& data, u64 r_offset) { u64 OffsetVfsFile::WriteBytes(const std::vector<u8>& data, u64 r_offset) {
auto end = data.end(); auto end = data.end();
if (data.size() + r_offset > size) if (data.size() + r_offset > size)
end = data.begin + size - r_offset; end = data.begin() + size - r_offset;
return file->WriteBytes(std::vector<u8>(data.begin(), end), r_offset + offset); return file->WriteBytes(std::vector<u8>(data.begin(), end), r_offset + offset);
} }

2
src/core/file_sys/vfs_offset.h
View File

@@ -8,7 +8,7 @@
namespace FileSys { namespace FileSys {
struct OffsetVfsFile : public VfsFile { struct OffsetVfsFile : public VfsFile {
OffsetVfsFile(VfsFile&& file, u64 offset, u64 size); OffsetVfsFile(std::unique_ptr<VfsFile>&& file, u64 offset, u64 size);
bool IsReady() override; bool IsReady() override;
bool IsGood() override; bool IsGood() override;