Merge pull request #990 from lioncash/entry

fsp_srv: Emplace entries first when building index instead of emplacing last
This commit is contained in:
bunnei 2018-08-09 19:29:36 -04:00 committed by GitHub
commit 69cd213fac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions

View file

@ -193,13 +193,10 @@ private:
template <typename T>
static void BuildEntryIndex(std::vector<FileSys::Entry>& entries, const std::vector<T>& new_data,
FileSys::EntryType type) {
entries.reserve(entries.size() + new_data.size());
for (const auto& new_entry : new_data) {
FileSys::Entry entry;
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(std::move(entry));
entries.emplace_back(new_entry->GetName(), type, new_entry->GetSize());
}
}