diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-08-08 17:49:57 -0400 | 
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-08-08 18:51:52 -0400 | 
| commit | 7353cfc7813c960e7fdb0b33829865c606f98c84 (patch) | |
| tree | 65c5bc3a27c0df3229145afb2552993ba72a46be /src/core/hle | |
| parent | 4afb05d0cc35f36ea145768f052755554d9494fc (diff) | |
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.cpp | 6 | 
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      entries.reserve(entries.size() + new_data.size());      for (const auto& new_entry : new_data) { -        auto& entry = entries.emplace_back(); -        entry.filename[0] = '\0'; -        std::strncat(entry.filename, new_entry->GetName().c_str(), FileSys::FILENAME_LENGTH - 1); -        entry.type = type; -        entry.file_size = new_entry->GetSize(); +        entries.emplace_back(new_entry->GetName(), type, new_entry->GetSize());      }  } | 
