summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/Src/FileHandlerARC.cpp
diff options
context:
space:
mode:
authorXTra.KrazzY <XTra.KrazzY@gmail.com>2008-09-21 13:32:33 +0000
committerXTra.KrazzY <XTra.KrazzY@gmail.com>2008-09-21 13:32:33 +0000
commitde577e521fdedc17ccf0599de211a624e6496149 (patch)
treedcc09a8d3b035dc2f69405594d9c18e2858c9d27 /Source/Core/DiscIO/Src/FileHandlerARC.cpp
parentb6407396d86d39dafa37abad39b66607eeb53ed0 (diff)
Unified two very, very similar structures with the name "SFileInfo"
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@595 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/FileHandlerARC.cpp')
-rw-r--r--Source/Core/DiscIO/Src/FileHandlerARC.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.cpp b/Source/Core/DiscIO/Src/FileHandlerARC.cpp
index 8d40df18ec..17c7270efb 100644
--- a/Source/Core/DiscIO/Src/FileHandlerARC.cpp
+++ b/Source/Core/DiscIO/Src/FileHandlerARC.cpp
@@ -192,25 +192,25 @@ CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, cons
// this is a directory, build up the new szDirectory
if (_szDirectory != NULL)
{
- rFileInfo.m_FullPath = StringFromFormat("%s%s\\", _szDirectory, &_szNameTable[uOffset]);
+ sprintf(rFileInfo.m_FullPath, "%s%s\\", _szDirectory, &_szNameTable[uOffset]);
}
else
{
- rFileInfo.m_FullPath = StringFromFormat("%s\\", &_szNameTable[uOffset]);
+ sprintf(rFileInfo.m_FullPath, "%s\\", &_szNameTable[uOffset]);
}
- CurrentIndex = BuildFilenames(CurrentIndex + 1, rFileInfo.m_FileSize, rFileInfo.m_FullPath.c_str(), _szNameTable);
+ CurrentIndex = BuildFilenames(CurrentIndex + 1, rFileInfo.m_FileSize, rFileInfo.m_FullPath, _szNameTable);
}
else
{
// this is a filename
if (_szDirectory != NULL)
{
- rFileInfo.m_FullPath = StringFromFormat("%s%s", _szDirectory, &_szNameTable[uOffset]);
+ sprintf(rFileInfo.m_FullPath, "%s%s", _szDirectory, &_szNameTable[uOffset]);
}
else
{
- rFileInfo.m_FullPath = StringFromFormat("%s", &_szNameTable[uOffset]);
+ sprintf(rFileInfo.m_FullPath, "%s", &_szNameTable[uOffset]);
}
CurrentIndex++;
@@ -221,12 +221,12 @@ CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, cons
}
-const CARCFile::SFileInfo*
+const SFileInfo*
CARCFile::FindFileInfo(std::string _rFullPath) const
{
for (size_t i = 0; i < m_FileInfoVector.size(); i++)
{
- if (!strcasecmp(m_FileInfoVector[i].m_FullPath.c_str(), _rFullPath.c_str()))
+ if (!strcasecmp(m_FileInfoVector[i].m_FullPath, _rFullPath.c_str()))
{
return(&m_FileInfoVector[i]);
}