diff options
| author | comex <comexk@gmail.com> | 2015-06-02 20:28:25 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2015-06-02 20:28:25 -0400 |
| commit | 2ae6fb9240ffd0a25727bede295d0d3afa3cab0c (patch) | |
| tree | e02ba90b4531807a39839857dcf3da8fa28d6666 /Source/Core/DiscIO/FileSystemGCWii.cpp | |
| parent | 36b554613ce15246bd37570a87b973ffcaa9b160 (diff) | |
| parent | d43a920924b11a825d474f75cba3996b676bb731 (diff) | |
Merge pull request #2338 from JosJuice/getfilelist-return
Filesystem: Return file list reference instead of modifying argument
Diffstat (limited to 'Source/Core/DiscIO/FileSystemGCWii.cpp')
| -rw-r--r-- | Source/Core/DiscIO/FileSystemGCWii.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index 242cc07713..cd6f815629 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -210,18 +210,12 @@ std::string CFileSystemGCWii::GetStringFromOffset(u64 _Offset) const return SHIFTJISToUTF8(data); } -size_t CFileSystemGCWii::GetFileList(std::vector<const SFileInfo *> &_rFilenames) +const std::vector<SFileInfo>& CFileSystemGCWii::GetFileList() { if (!m_Initialized) InitFileSystem(); - if (_rFilenames.size()) - PanicAlert("GetFileList : input list has contents?"); - _rFilenames.clear(); - _rFilenames.reserve(m_FileInfoVector.size()); - for (auto& fileInfo : m_FileInfoVector) - _rFilenames.push_back(&fileInfo); - return m_FileInfoVector.size(); + return m_FileInfoVector; } const SFileInfo* CFileSystemGCWii::FindFileInfo(const std::string& _rFullPath) |