From 3d5ef948d0d3984e4ef7c26fe56acf469868e0f3 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 29 Jul 2015 17:27:43 +0200 Subject: Filesystem: Make FindFileInfo public --- Source/Core/DiscIO/FileSystemGCWii.cpp | 50 +++++++++++++++++----------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'Source/Core/DiscIO/FileSystemGCWii.cpp') diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index fc0e40f055..f8ddab28fe 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -42,12 +42,34 @@ FileSystemGCWii::~FileSystemGCWii() m_FileInfoVector.clear(); } +const std::vector& FileSystemGCWii::GetFileList() +{ + if (!m_Initialized) + InitFileSystem(); + + return m_FileInfoVector; +} + +const FileInfo* FileSystemGCWii::FindFileInfo(const std::string& _rFullPath) +{ + if (!m_Initialized) + InitFileSystem(); + + for (size_t i = 0; i < m_FileInfoVector.size(); ++i) + { + if (!strcasecmp(GetPathFromFSTOffset(i).c_str(), _rFullPath.c_str())) + return &m_FileInfoVector[i]; + } + + return nullptr; +} + u64 FileSystemGCWii::GetFileSize(const std::string& _rFullPath) { if (!m_Initialized) InitFileSystem(); - const FileInfoGCWii* pFileInfo = FindFileInfo(_rFullPath); + const FileInfo* pFileInfo = FindFileInfo(_rFullPath); if (pFileInfo != nullptr && !pFileInfo->IsDirectory()) return pFileInfo->GetSize(); @@ -119,7 +141,7 @@ u64 FileSystemGCWii::ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _ if (!m_Initialized) InitFileSystem(); - const FileInfoGCWii* pFileInfo = FindFileInfo(_rFullPath); + const FileInfo* pFileInfo = FindFileInfo(_rFullPath); if (pFileInfo == nullptr) return 0; @@ -142,7 +164,7 @@ bool FileSystemGCWii::ExportFile(const std::string& _rFullPath, const std::strin if (!m_Initialized) InitFileSystem(); - const FileInfoGCWii* pFileInfo = FindFileInfo(_rFullPath); + const FileInfo* pFileInfo = FindFileInfo(_rFullPath); if (!pFileInfo) return false; @@ -276,28 +298,6 @@ std::string FileSystemGCWii::GetStringFromOffset(u64 _Offset) const return SHIFTJISToUTF8(data); } -const std::vector& FileSystemGCWii::GetFileList() -{ - if (!m_Initialized) - InitFileSystem(); - - return m_FileInfoVector; -} - -const FileInfoGCWii* FileSystemGCWii::FindFileInfo(const std::string& _rFullPath) -{ - if (!m_Initialized) - InitFileSystem(); - - for (size_t i = 0; i < m_FileInfoVector.size(); ++i) - { - if (!strcasecmp(GetPathFromFSTOffset(i).c_str(), _rFullPath.c_str())) - return &m_FileInfoVector[i]; - } - - return nullptr; -} - bool FileSystemGCWii::DetectFileSystem() { if (m_rVolume->ReadSwapped(0x18, m_partition) == u32(0x5D1C9EA3)) -- cgit v1.2.3