aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-10-15 20:11:42 -0400
committerLioncash <mathew1800@gmail.com>2018-10-15 20:11:44 -0400
commite83e140e3f2a1b46e426fcb52dcfd8ea09ec117f (patch)
tree48e70ddf985ea3ffe3507f77e0d36587b4515bb4
parenta25c7375722107c4eb0c9067fb2cdffc7e7eb7f9 (diff)
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 6bb5880804..a012c2be93 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 = {
};
std::string LanguageEntry::GetApplicationName() const {
- return Common::StringFromFixedZeroTerminatedBuffer(application_name.data(), 0x200);
+ return Common::StringFromFixedZeroTerminatedBuffer(application_name.data(),
+ application_name.size());
}
std::string LanguageEntry::GetDeveloperName() const {
- return Common::StringFromFixedZeroTerminatedBuffer(developer_name.data(), 0x100);
+ return Common::StringFromFixedZeroTerminatedBuffer(developer_name.data(),
+ developer_name.size());
}
NACP::NACP(VirtualFile file) : raw(std::make_unique<RawNACP>()) {
@@ -61,6 +63,7 @@ u64 NACP::GetDLCBaseTitleId() const {
}
std::string NACP::GetVersionString() const {
- return Common::StringFromFixedZeroTerminatedBuffer(raw->version_string.data(), 0x10);
+ return Common::StringFromFixedZeroTerminatedBuffer(raw->version_string.data(),
+ raw->version_string.size());
}
} // namespace FileSys