summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lioncash2018-10-15 20:11:42 -0400
committerGravatar Lioncash2018-10-15 20:11:44 -0400
commit76fc8b59b261c62d73ae44eba2cd8b3a4cbe14cb (patch)
tree48e70ddf985ea3ffe3507f77e0d36587b4515bb4
parentMerge pull request #1494 from DarkLordZach/aoc-signature-fixes (diff)
downloadyuzu-76fc8b59b261c62d73ae44eba2cd8b3a4cbe14cb.tar.gz
yuzu-76fc8b59b261c62d73ae44eba2cd8b3a4cbe14cb.tar.xz
yuzu-76fc8b59b261c62d73ae44eba2cd8b3a4cbe14cb.zip
file_sys/control_metadata: Get rid of magic constants
These are just the size of the data being passed in, so we can specify that via the size() member function.
-rw-r--r--src/core/file_sys/control_metadata.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/file_sys/control_metadata.cpp b/src/core/file_sys/control_metadata.cpp
index 6bb588080..a012c2be9 100644
--- a/src/core/file_sys/control_metadata.cpp
+++ b/src/core/file_sys/control_metadata.cpp
@@ -17,11 +17,13 @@ const std::array<const char*, 15> LANGUAGE_NAMES = {
17}; 17};
18 18
19std::string LanguageEntry::GetApplicationName() const { 19std::string LanguageEntry::GetApplicationName() const {
20 return Common::StringFromFixedZeroTerminatedBuffer(application_name.data(), 0x200); 20 return Common::StringFromFixedZeroTerminatedBuffer(application_name.data(),
21 application_name.size());
21} 22}
22 23
23std::string LanguageEntry::GetDeveloperName() const { 24std::string LanguageEntry::GetDeveloperName() const {
24 return Common::StringFromFixedZeroTerminatedBuffer(developer_name.data(), 0x100); 25 return Common::StringFromFixedZeroTerminatedBuffer(developer_name.data(),
26 developer_name.size());
25} 27}
26 28
27NACP::NACP(VirtualFile file) : raw(std::make_unique<RawNACP>()) { 29NACP::NACP(VirtualFile file) : raw(std::make_unique<RawNACP>()) {
@@ -61,6 +63,7 @@ u64 NACP::GetDLCBaseTitleId() const {
61} 63}
62 64
63std::string NACP::GetVersionString() const { 65std::string NACP::GetVersionString() const {
64 return Common::StringFromFixedZeroTerminatedBuffer(raw->version_string.data(), 0x10); 66 return Common::StringFromFixedZeroTerminatedBuffer(raw->version_string.data(),
67 raw->version_string.size());
65} 68}
66} // namespace FileSys 69} // namespace FileSys