From f325fc9634350f63faa7b04893805ada8d3f8816 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 14 Mar 2014 21:27:28 -0400 Subject: Clean up FileHandlerARC.cpp/.h - Removed parentheses from the returns. - Put the function declaration headers back on a single line. - Make FindFileInfo's parameter a const string reference. --- Source/Core/DiscIO/FileHandlerARC.cpp | 54 +++++++++++++++-------------------- 1 file changed, 23 insertions(+), 31 deletions(-) (limited to 'Source/Core/DiscIO/FileHandlerARC.cpp') diff --git a/Source/Core/DiscIO/FileHandlerARC.cpp b/Source/Core/DiscIO/FileHandlerARC.cpp index ee24158053..960ecaf07d 100644 --- a/Source/Core/DiscIO/FileHandlerARC.cpp +++ b/Source/Core/DiscIO/FileHandlerARC.cpp @@ -69,70 +69,66 @@ CARCFile::~CARCFile() } -bool -CARCFile::IsInitialized() +bool CARCFile::IsInitialized() { - return(m_Initialized); + return m_Initialized; } -size_t -CARCFile::GetFileSize(const std::string& _rFullPath) +size_t CARCFile::GetFileSize(const std::string& _rFullPath) { if (!m_Initialized) { - return(0); + return 0; } const SFileInfo* pFileInfo = FindFileInfo(_rFullPath); if (pFileInfo != nullptr) { - return((size_t) pFileInfo->m_FileSize); + return (size_t) pFileInfo->m_FileSize; } - return(0); + return 0; } -size_t -CARCFile::ReadFile(const std::string& _rFullPath, u8* _pBuffer, size_t _MaxBufferSize) +size_t CARCFile::ReadFile(const std::string& _rFullPath, u8* _pBuffer, size_t _MaxBufferSize) { if (!m_Initialized) { - return(0); + return 0; } const SFileInfo* pFileInfo = FindFileInfo(_rFullPath); if (pFileInfo == nullptr) { - return(0); + return 0; } if (pFileInfo->m_FileSize > _MaxBufferSize) { - return(0); + return 0; } memcpy(_pBuffer, &m_pBuffer[pFileInfo->m_Offset], (size_t)pFileInfo->m_FileSize); - return((size_t) pFileInfo->m_FileSize); + return (size_t) pFileInfo->m_FileSize; } -bool -CARCFile::ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename) +bool CARCFile::ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename) { if (!m_Initialized) { - return(false); + return false; } const SFileInfo* pFileInfo = FindFileInfo(_rFullPath); if (pFileInfo == nullptr) { - return(false); + return false; } File::IOFile pFile(_rExportFilename, "wb"); @@ -141,15 +137,13 @@ CARCFile::ExportFile(const std::string& _rFullPath, const std::string& _rExportF } -bool -CARCFile::ExportAllFiles(const std::string& _rFullPath) +bool CARCFile::ExportAllFiles(const std::string& _rFullPath) { - return(false); + return false; } -bool -CARCFile::ParseBuffer() +bool CARCFile::ParseBuffer() { // check ID u32 ID = Common::swap32(*(u32*)(m_pBuffer)); @@ -186,12 +180,11 @@ CARCFile::ParseBuffer() BuildFilenames(1, m_FileInfoVector.size(), nullptr, szNameTable); } - return(true); + return true; } -size_t -CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const char* _szDirectory, const char* _szNameTable) +size_t CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const char* _szDirectory, const char* _szNameTable) { size_t CurrentIndex = _FirstIndex; @@ -231,21 +224,20 @@ CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, cons } } - return(CurrentIndex); + return CurrentIndex; } -const SFileInfo* -CARCFile::FindFileInfo(std::string _rFullPath) const +const SFileInfo* CARCFile::FindFileInfo(const std::string& _rFullPath) const { for (auto& fileInfo : m_FileInfoVector) { if (!strcasecmp(fileInfo.m_FullPath, _rFullPath.c_str())) { - return(&fileInfo); + return &fileInfo; } } - return(nullptr); + return nullptr; } } // namespace -- cgit v1.2.3 From bd1ce18f9092f2929929513729e8abee8f60e4a5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 14 Mar 2014 23:38:14 -0400 Subject: Simplify file tree building for the filesystem view. Technically this also simplifies on disc filename building in general. --- Source/Core/DiscIO/FileHandlerARC.cpp | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) (limited to 'Source/Core/DiscIO/FileHandlerARC.cpp') diff --git a/Source/Core/DiscIO/FileHandlerARC.cpp b/Source/Core/DiscIO/FileHandlerARC.cpp index 960ecaf07d..6215b0a100 100644 --- a/Source/Core/DiscIO/FileHandlerARC.cpp +++ b/Source/Core/DiscIO/FileHandlerARC.cpp @@ -9,6 +9,7 @@ #include "Common/Common.h" #include "Common/FileUtil.h" +#include "Common/StringUtil.h" #include "DiscIO/Blob.h" #include "DiscIO/FileHandlerARC.h" #include "DiscIO/Filesystem.h" @@ -86,7 +87,7 @@ size_t CARCFile::GetFileSize(const std::string& _rFullPath) if (pFileInfo != nullptr) { - return (size_t) pFileInfo->m_FileSize; + return (size_t)pFileInfo->m_FileSize; } return 0; @@ -177,14 +178,14 @@ bool CARCFile::ParseBuffer() szNameTable += 0xC; } - BuildFilenames(1, m_FileInfoVector.size(), nullptr, szNameTable); + BuildFilenames(1, m_FileInfoVector.size(), "", szNameTable); } return true; } -size_t CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const char* _szDirectory, const char* _szNameTable) +size_t CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const std::string& _szDirectory, const char* _szNameTable) { size_t CurrentIndex = _FirstIndex; @@ -196,29 +197,19 @@ size_t CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastInde // check next index if (rFileInfo.IsDirectory()) { - // this is a directory, build up the new szDirectory - if (_szDirectory != nullptr) - { - sprintf(rFileInfo.m_FullPath, "%s%s/", _szDirectory, &_szNameTable[uOffset]); - } + if (_szDirectory.empty()) + rFileInfo.m_FullPath += StringFromFormat("%s/", &_szNameTable[uOffset]); else - { - sprintf(rFileInfo.m_FullPath, "%s/", &_szNameTable[uOffset]); - } + rFileInfo.m_FullPath += StringFromFormat("%s%s/", _szDirectory.c_str(), &_szNameTable[uOffset]); CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t) rFileInfo.m_FileSize, rFileInfo.m_FullPath, _szNameTable); } - else + else // This is a filename { - // this is a filename - if (_szDirectory != nullptr) - { - sprintf(rFileInfo.m_FullPath, "%s%s", _szDirectory, &_szNameTable[uOffset]); - } + if (_szDirectory.empty()) + rFileInfo.m_FullPath += StringFromFormat("%s", &_szNameTable[uOffset]); else - { - sprintf(rFileInfo.m_FullPath, "%s", &_szNameTable[uOffset]); - } + rFileInfo.m_FullPath += StringFromFormat("%s%s", _szDirectory.c_str(), &_szNameTable[uOffset]); CurrentIndex++; } @@ -232,7 +223,7 @@ const SFileInfo* CARCFile::FindFileInfo(const std::string& _rFullPath) const { for (auto& fileInfo : m_FileInfoVector) { - if (!strcasecmp(fileInfo.m_FullPath, _rFullPath.c_str())) + if (!strcasecmp(fileInfo.m_FullPath.c_str(), _rFullPath.c_str())) { return &fileInfo; } -- cgit v1.2.3