From de577e521fdedc17ccf0599de211a624e6496149 Mon Sep 17 00:00:00 2001
From: "XTra.KrazzY" <XTra.KrazzY@gmail.com>
Date: Sun, 21 Sep 2008 13:32:33 +0000
Subject: [PATCH] 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
---
 Source/Core/DiscIO/Src/FileHandlerARC.cpp | 14 +++++++-------
 Source/Core/DiscIO/Src/FileHandlerARC.h   | 11 -----------
 Source/Core/DiscIO/Src/Filesystem.h       |  1 +
 3 files changed, 8 insertions(+), 18 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]);
 		}
diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.h b/Source/Core/DiscIO/Src/FileHandlerARC.h
index b8e47c45f9..0dccc0ce5f 100644
--- a/Source/Core/DiscIO/Src/FileHandlerARC.h
+++ b/Source/Core/DiscIO/Src/FileHandlerARC.h
@@ -51,17 +51,6 @@ class CARCFile
 
 		bool m_Initialized;
 
-		struct SFileInfo
-		{
-			u32 m_NameOffset;
-			u32 m_Offset;
-			u32 m_FileSize;
-
-			std::string m_FullPath;
-
-			bool IsDirectory() {return((m_NameOffset& 0xFF000000) != 0 ? true : false);}
-		};
-
 		typedef std::vector<SFileInfo>CFileInfoVector;
 		CFileInfoVector m_FileInfoVector;
 
diff --git a/Source/Core/DiscIO/Src/Filesystem.h b/Source/Core/DiscIO/Src/Filesystem.h
index d8f1469080..16fe2c998e 100644
--- a/Source/Core/DiscIO/Src/Filesystem.h
+++ b/Source/Core/DiscIO/Src/Filesystem.h
@@ -22,6 +22,7 @@
 
 namespace DiscIO
 {
+
 // file info of an FST entry
 struct SFileInfo
 {