The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 14:46:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

DirectoryBlob: Change ConvertUTF8NamesToSHIFTJIS's parameter to pointer

Browse Source
This commit is contained in:
JosJuice 2017-06-11 13:47:03 +02:00
parent 34fd08e7eb
commit 1ea44f425d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DiscIO/DirectoryBlob.cpp
View File

@ -46,7 +46,7 @@ static void Write32(u32 data, u32 offset, std::vector<u8>* buffer);
static u32 ComputeNameSize(const File::FSTEntry& parent_entry); static u32 ComputeNameSize(const File::FSTEntry& parent_entry);
static std::string ASCIIToUppercase(std::string str); static std::string ASCIIToUppercase(std::string str);
static void ConvertUTF8NamesToSHIFTJIS(File::FSTEntry& parent_entry); static void ConvertUTF8NamesToSHIFTJIS(File::FSTEntry* parent_entry);
enum class PartitionType : u32 enum class PartitionType : u32
{ {
@ -553,7 +553,7 @@ void DirectoryBlobPartition::BuildFST(u64 fst_address)
File::FSTEntry rootEntry = File::ScanDirectoryTree(m_root_directory + "files/", true); File::FSTEntry rootEntry = File::ScanDirectoryTree(m_root_directory + "files/", true);
ConvertUTF8NamesToSHIFTJIS(rootEntry); ConvertUTF8NamesToSHIFTJIS(&rootEntry);
u32 name_table_size = Common::AlignUp(ComputeNameSize(rootEntry), 1ull << m_address_shift); u32 name_table_size = Common::AlignUp(ComputeNameSize(rootEntry), 1ull << m_address_shift);
u64 total_entries = rootEntry.size + 1; // The root entry itself isn't counted in rootEntry.size u64 total_entries = rootEntry.size + 1; // The root entry itself isn't counted in rootEntry.size
@ -700,12 +700,12 @@ static u32 ComputeNameSize(const File::FSTEntry& parent_entry)
return name_size; return name_size;
} }
static void ConvertUTF8NamesToSHIFTJIS(File::FSTEntry& parent_entry) static void ConvertUTF8NamesToSHIFTJIS(File::FSTEntry* parent_entry)
{ {
for (File::FSTEntry& entry : parent_entry.children) for (File::FSTEntry& entry : parent_entry->children)
{ {
if (entry.isDirectory) if (entry.isDirectory)
ConvertUTF8NamesToSHIFTJIS(entry); ConvertUTF8NamesToSHIFTJIS(&entry);
entry.virtualName = UTF8ToSHIFTJIS(entry.virtualName); entry.virtualName = UTF8ToSHIFTJIS(entry.virtualName);
} }