diff options
| author | 2018-10-16 13:13:40 -0400 | |
|---|---|---|
| committer | 2018-10-16 13:22:31 -0400 | |
| commit | 441b5b97bd4f0c01b33785ef4d32b3ef3d7ea4fa (patch) | |
| tree | b7f8486233a43f1b60d9b7e9021c6777cfa4e94c | |
| parent | content_archive: Simplify rights ID check (diff) | |
| download | yuzu-441b5b97bd4f0c01b33785ef4d32b3ef3d7ea4fa.tar.gz yuzu-441b5b97bd4f0c01b33785ef4d32b3ef3d7ea4fa.tar.xz yuzu-441b5b97bd4f0c01b33785ef4d32b3ef3d7ea4fa.zip | |
content_archive: Make IsValidNCA() an internally linked function
This is only ever used within the cpp file, so it can just be an
internal function.
| -rw-r--r-- | src/core/file_sys/content_archive.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/content_archive.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cpp index a6bd3369c..6ce1cb0ae 100644 --- a/src/core/file_sys/content_archive.cpp +++ b/src/core/file_sys/content_archive.cpp | |||
| @@ -97,7 +97,7 @@ union NCASectionHeader { | |||
| 97 | }; | 97 | }; |
| 98 | static_assert(sizeof(NCASectionHeader) == 0x200, "NCASectionHeader has incorrect size."); | 98 | static_assert(sizeof(NCASectionHeader) == 0x200, "NCASectionHeader has incorrect size."); |
| 99 | 99 | ||
| 100 | bool IsValidNCA(const NCAHeader& header) { | 100 | static bool IsValidNCA(const NCAHeader& header) { |
| 101 | // TODO(DarkLordZach): Add NCA2/NCA0 support. | 101 | // TODO(DarkLordZach): Add NCA2/NCA0 support. |
| 102 | return header.magic == Common::MakeMagic('N', 'C', 'A', '3'); | 102 | return header.magic == Common::MakeMagic('N', 'C', 'A', '3'); |
| 103 | } | 103 | } |
diff --git a/src/core/file_sys/content_archive.h b/src/core/file_sys/content_archive.h index e5d3d3c6a..1c903cd3f 100644 --- a/src/core/file_sys/content_archive.h +++ b/src/core/file_sys/content_archive.h | |||
| @@ -73,8 +73,6 @@ inline bool IsDirectoryExeFS(const std::shared_ptr<VfsDirectory>& pfs) { | |||
| 73 | return pfs->GetFile("main") != nullptr && pfs->GetFile("main.npdm") != nullptr; | 73 | return pfs->GetFile("main") != nullptr && pfs->GetFile("main.npdm") != nullptr; |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | bool IsValidNCA(const NCAHeader& header); | ||
| 77 | |||
| 78 | // An implementation of VfsDirectory that represents a Nintendo Content Archive (NCA) conatiner. | 76 | // An implementation of VfsDirectory that represents a Nintendo Content Archive (NCA) conatiner. |
| 79 | // After construction, use GetStatus to determine if the file is valid and ready to be used. | 77 | // After construction, use GetStatus to determine if the file is valid and ready to be used. |
| 80 | class NCA : public ReadOnlyVfsDirectory { | 78 | class NCA : public ReadOnlyVfsDirectory { |