diff options
| author | 2018-09-26 16:09:16 -0400 | |
|---|---|---|
| committer | 2018-09-26 16:09:16 -0400 | |
| commit | 92dd496fb94385aa16adec75d6eb8bc3ef29c6b0 (patch) | |
| tree | 113a0ad25b279c70d825514e9e35020f08a366a4 /src/core/file_sys/vfs.cpp | |
| parent | Merge pull request #1398 from lioncash/macos (diff) | |
| parent | patch_manager: Invert conditionals within ApplyLayeredFS() (diff) | |
| download | yuzu-92dd496fb94385aa16adec75d6eb8bc3ef29c6b0.tar.gz yuzu-92dd496fb94385aa16adec75d6eb8bc3ef29c6b0.tar.xz yuzu-92dd496fb94385aa16adec75d6eb8bc3ef29c6b0.zip | |
Merge pull request #1401 from lioncash/vfs
vfs: Minor cleanup related changes to layered VFS code
Diffstat (limited to 'src/core/file_sys/vfs.cpp')
| -rw-r--r-- | src/core/file_sys/vfs.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/vfs.cpp b/src/core/file_sys/vfs.cpp index 5fbea1739..bfe50da73 100644 --- a/src/core/file_sys/vfs.cpp +++ b/src/core/file_sys/vfs.cpp | |||
| @@ -463,14 +463,14 @@ bool DeepEquals(const VirtualFile& file1, const VirtualFile& file2, std::size_t | |||
| 463 | return true; | 463 | return true; |
| 464 | } | 464 | } |
| 465 | 465 | ||
| 466 | bool VfsRawCopy(const VirtualFile& src, const VirtualFile& dest, size_t block_size) { | 466 | bool VfsRawCopy(const VirtualFile& src, const VirtualFile& dest, std::size_t block_size) { |
| 467 | if (src == nullptr || dest == nullptr || !src->IsReadable() || !dest->IsWritable()) | 467 | if (src == nullptr || dest == nullptr || !src->IsReadable() || !dest->IsWritable()) |
| 468 | return false; | 468 | return false; |
| 469 | if (!dest->Resize(src->GetSize())) | 469 | if (!dest->Resize(src->GetSize())) |
| 470 | return false; | 470 | return false; |
| 471 | 471 | ||
| 472 | std::vector<u8> temp(std::min(block_size, src->GetSize())); | 472 | std::vector<u8> temp(std::min(block_size, src->GetSize())); |
| 473 | for (size_t i = 0; i < src->GetSize(); i += block_size) { | 473 | for (std::size_t i = 0; i < src->GetSize(); i += block_size) { |
| 474 | const auto read = std::min(block_size, src->GetSize() - i); | 474 | const auto read = std::min(block_size, src->GetSize() - i); |
| 475 | const auto block = src->Read(temp.data(), read, i); | 475 | const auto block = src->Read(temp.data(), read, i); |
| 476 | 476 | ||
| @@ -481,7 +481,7 @@ bool VfsRawCopy(const VirtualFile& src, const VirtualFile& dest, size_t block_si | |||
| 481 | return true; | 481 | return true; |
| 482 | } | 482 | } |
| 483 | 483 | ||
| 484 | bool VfsRawCopyD(const VirtualDir& src, const VirtualDir& dest, size_t block_size) { | 484 | bool VfsRawCopyD(const VirtualDir& src, const VirtualDir& dest, std::size_t block_size) { |
| 485 | if (src == nullptr || dest == nullptr || !src->IsReadable() || !dest->IsWritable()) | 485 | if (src == nullptr || dest == nullptr || !src->IsReadable() || !dest->IsWritable()) |
| 486 | return false; | 486 | return false; |
| 487 | 487 | ||