diff options
author | bunnei <bunneidev@gmail.com> | 2019-11-28 07:18:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-28 07:18:10 +0100 |
commit | fe65045dcb645ef57d02d617d8153382471732f9 (patch) | |
tree | 02d377df3ecfd8abb1229c79cdcde3ba26f02a1f /src/core/file_sys | |
parent | patch_manager: Adds check for disabled cheats to prevent them from being enabled (#3178) (diff) | |
parent | filesys/romfs: Remove unused includes (diff) | |
download | yuzu-fe65045dcb645ef57d02d617d8153382471732f9.tar yuzu-fe65045dcb645ef57d02d617d8153382471732f9.tar.gz yuzu-fe65045dcb645ef57d02d617d8153382471732f9.tar.bz2 yuzu-fe65045dcb645ef57d02d617d8153382471732f9.tar.lz yuzu-fe65045dcb645ef57d02d617d8153382471732f9.tar.xz yuzu-fe65045dcb645ef57d02d617d8153382471732f9.tar.zst yuzu-fe65045dcb645ef57d02d617d8153382471732f9.zip |
Diffstat (limited to 'src/core/file_sys')
-rw-r--r-- | src/core/file_sys/romfs.cpp | 7 | ||||
-rw-r--r-- | src/core/file_sys/romfs.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/core/file_sys/romfs.cpp b/src/core/file_sys/romfs.cpp index ebbdf081e..c909d1ce4 100644 --- a/src/core/file_sys/romfs.cpp +++ b/src/core/file_sys/romfs.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <memory> + #include "common/common_types.h" #include "common/swap.h" #include "core/file_sys/fsmitm_romfsbuild.h" @@ -12,7 +14,7 @@ #include "core/file_sys/vfs_vector.h" namespace FileSys { - +namespace { constexpr u32 ROMFS_ENTRY_EMPTY = 0xFFFFFFFF; struct TableLocation { @@ -51,7 +53,7 @@ struct FileEntry { static_assert(sizeof(FileEntry) == 0x20, "FileEntry has incorrect size."); template <typename Entry> -static std::pair<Entry, std::string> GetEntry(const VirtualFile& file, std::size_t offset) { +std::pair<Entry, std::string> GetEntry(const VirtualFile& file, std::size_t offset) { Entry entry{}; if (file->ReadObject(&entry, offset) != sizeof(Entry)) return {}; @@ -99,6 +101,7 @@ void ProcessDirectory(VirtualFile file, std::size_t dir_offset, std::size_t file this_dir_offset = entry.first.sibling; } } +} // Anonymous namespace VirtualDir ExtractRomFS(VirtualFile file, RomFSExtractionType type) { RomFSHeader header{}; diff --git a/src/core/file_sys/romfs.h b/src/core/file_sys/romfs.h index 1c89be8a4..2fd07ed04 100644 --- a/src/core/file_sys/romfs.h +++ b/src/core/file_sys/romfs.h @@ -5,10 +5,6 @@ #pragma once #include <array> -#include <map> -#include "common/common_funcs.h" -#include "common/common_types.h" -#include "common/swap.h" #include "core/file_sys/vfs.h" namespace FileSys { |