summaryrefslogtreecommitdiff
path: root/src/core/hle
diff options
context:
space:
mode:
authorGravatar Lioncash2018-08-08 17:49:57 -0400
committerGravatar Lioncash2018-08-08 18:51:52 -0400
commit7353cfc7813c960e7fdb0b33829865c606f98c84 (patch)
tree65c5bc3a27c0df3229145afb2552993ba72a46be /src/core/hle
parentfsp_srv: Emplace entries first when building index instead of emplacing last (diff)
downloadyuzu-7353cfc7813c960e7fdb0b33829865c606f98c84.tar.gz
yuzu-7353cfc7813c960e7fdb0b33829865c606f98c84.tar.xz
yuzu-7353cfc7813c960e7fdb0b33829865c606f98c84.zip
fsp_srv: Use std::string_view's copy() function instead of strncpy()
Given elements inserted into a vector are zeroed out, we can just copy MAX_LEN - 1 elements and the data will already be properly null terminated.
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/filesystem/fsp_srv.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp
index 4110e67b4..1470f9017 100644
--- a/src/core/hle/service/filesystem/fsp_srv.cpp
+++ b/src/core/hle/service/filesystem/fsp_srv.cpp
@@ -196,11 +196,7 @@ static void BuildEntryIndex(std::vector<FileSys::Entry>& entries, const std::vec
196 entries.reserve(entries.size() + new_data.size()); 196 entries.reserve(entries.size() + new_data.size());
197 197
198 for (const auto& new_entry : new_data) { 198 for (const auto& new_entry : new_data) {
199 auto& entry = entries.emplace_back(); 199 entries.emplace_back(new_entry->GetName(), type, new_entry->GetSize());
200 entry.filename[0] = '\0';
201 std::strncat(entry.filename, new_entry->GetName().c_str(), FileSys::FILENAME_LENGTH - 1);
202 entry.type = type;
203 entry.file_size = new_entry->GetSize();
204 } 200 }
205} 201}
206 202