diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2018-04-12 14:18:04 +0200 |
|---|---|---|
| committer | spycrab <spycrab@users.noreply.github.com> | 2018-04-12 21:28:39 +0200 |
| commit | 40bb9974f21878e64fb03d70e717cb996bf13a29 (patch) | |
| tree | 1d8a9e7eea10820e5d645ad5028e506836b856de /Source/Core/DiscIO | |
| parent | d27e85e9d70dfb41a5b8880fd3375a0ac9574f5d (diff) | |
Reformat all the things!
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/DirectoryBlob.cpp | 13 | ||||
| -rw-r--r-- | Source/Core/DiscIO/DirectoryBlob.h | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/DiscExtractor.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/DiscIO/DriveBlob.h | 1 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Filesystem.h | 1 | ||||
| -rw-r--r-- | Source/Core/DiscIO/VolumeWii.h | 1 |
6 files changed, 15 insertions, 8 deletions
diff --git a/Source/Core/DiscIO/DirectoryBlob.cpp b/Source/Core/DiscIO/DirectoryBlob.cpp index d8912ec54d..61aac73694 100644 --- a/Source/Core/DiscIO/DirectoryBlob.cpp +++ b/Source/Core/DiscIO/DirectoryBlob.cpp @@ -731,12 +731,13 @@ void DirectoryBlobPartition::WriteDirectory(const File::FSTEntry& parent_entry, std::vector<File::FSTEntry> sorted_entries = parent_entry.children; // Sort for determinism - std::sort(sorted_entries.begin(), sorted_entries.end(), [](const File::FSTEntry& one, - const File::FSTEntry& two) { - const std::string one_upper = ASCIIToUppercase(one.virtualName); - const std::string two_upper = ASCIIToUppercase(two.virtualName); - return one_upper == two_upper ? one.virtualName < two.virtualName : one_upper < two_upper; - }); + std::sort(sorted_entries.begin(), sorted_entries.end(), + [](const File::FSTEntry& one, const File::FSTEntry& two) { + const std::string one_upper = ASCIIToUppercase(one.virtualName); + const std::string two_upper = ASCIIToUppercase(two.virtualName); + return one_upper == two_upper ? one.virtualName < two.virtualName : + one_upper < two_upper; + }); for (const File::FSTEntry& entry : sorted_entries) { diff --git a/Source/Core/DiscIO/DirectoryBlob.h b/Source/Core/DiscIO/DirectoryBlob.h index 70ff61c91b..9da34cc0f0 100644 --- a/Source/Core/DiscIO/DirectoryBlob.h +++ b/Source/Core/DiscIO/DirectoryBlob.h @@ -52,6 +52,7 @@ public: bool operator>(const DiscContent& other) const { return other < *this; } bool operator<=(const DiscContent& other) const { return !(*this < other); } bool operator>=(const DiscContent& other) const { return !(*this > other); } + private: u64 m_offset; u64 m_size = 0; @@ -94,6 +95,7 @@ public: const std::string& GetRootDirectory() const { return m_root_directory; } const std::vector<u8>& GetHeader() const { return m_disc_header; } const DiscContentContainer& GetContents() const { return m_contents; } + private: void SetDiscHeaderAndDiscType(std::optional<bool> is_wii); void SetBI2(); diff --git a/Source/Core/DiscIO/DiscExtractor.cpp b/Source/Core/DiscIO/DiscExtractor.cpp index 7837516f29..7494bd5ab7 100644 --- a/Source/Core/DiscIO/DiscExtractor.cpp +++ b/Source/Core/DiscIO/DiscExtractor.cpp @@ -50,8 +50,9 @@ u64 ReadFile(const Volume& volume, const Partition& partition, const FileInfo* f const u64 read_length = std::min(max_buffer_size, file_info->GetSize() - offset_in_file); - DEBUG_LOG(DISCIO, "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64 - " Size: %" PRIx32, + DEBUG_LOG(DISCIO, + "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64 + " Size: %" PRIx32, read_length, offset_in_file, file_info->GetPath().c_str(), file_info->GetOffset(), file_info->GetSize()); diff --git a/Source/Core/DiscIO/DriveBlob.h b/Source/Core/DiscIO/DriveBlob.h index fd36815600..5580d30179 100644 --- a/Source/Core/DiscIO/DriveBlob.h +++ b/Source/Core/DiscIO/DriveBlob.h @@ -26,6 +26,7 @@ public: BlobType GetBlobType() const override { return BlobType::DRIVE; } u64 GetDataSize() const override { return m_size; } u64 GetRawSize() const override { return m_size; } + private: DriveReader(const std::string& drive); bool GetBlock(u64 block_num, u8* out_ptr) override; diff --git a/Source/Core/DiscIO/Filesystem.h b/Source/Core/DiscIO/Filesystem.h index 8d2adbd0a2..37dc7f9b7e 100644 --- a/Source/Core/DiscIO/Filesystem.h +++ b/Source/Core/DiscIO/Filesystem.h @@ -65,6 +65,7 @@ public: // pointers, but will not invalidate copies of the iterator or file info object. const FileInfo& operator*() const { return *m_file_info.get(); } const FileInfo* operator->() const { return m_file_info.get(); } + private: std::unique_ptr<FileInfo> m_file_info; }; diff --git a/Source/Core/DiscIO/VolumeWii.h b/Source/Core/DiscIO/VolumeWii.h index 84d58a530c..b854ae5917 100644 --- a/Source/Core/DiscIO/VolumeWii.h +++ b/Source/Core/DiscIO/VolumeWii.h @@ -67,6 +67,7 @@ public: protected: u32 GetOffsetShift() const override { return 2; } + private: struct PartitionDetails { |
