midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address review

Browse Source 
simplify code
This commit is contained in:
zhupengfei 2020-02-07 23:53:00 +08:00
parent 2ec99b83aa
commit db18f6c79a
No known key found for this signature in database
GPG Key ID: DD129E108BD09378
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/file_sys/layered_fs.cpp
View File

@ -306,18 +306,10 @@ void LayeredFS::PrepareBuild(Directory& current) {
// Implementation from 3dbrew // Implementation from 3dbrew
u32 CalcHash(const std::string& name, u32 parent_offset) { u32 CalcHash(const std::string& name, u32 parent_offset) {
u32 hash = parent_offset ^ 123456789; u32 hash = parent_offset ^ 123456789;
std::u16string u16name = Common::UTF8ToUTF16(name); std::u16string u16name = Common::UTF8ToUTF16(name);
std::vector<u16_le> tmp_buffer(u16name.size()); for (char16_t c : u16name) {
std::transform(u16name.begin(), u16name.end(), tmp_buffer.begin(), [](char16_t character) {
return static_cast<u16_le>(static_cast<u16>(character));
});
std::vector<u8> buffer(tmp_buffer.size() * 2);
std::memcpy(buffer.data(), tmp_buffer.data(), buffer.size());
for (std::size_t i = 0; i < buffer.size(); i += 2) {
hash = (hash >> 5) | (hash << 27); hash = (hash >> 5) | (hash << 27);
hash ^= static_cast<u16>((buffer[i]) | (buffer[i + 1] << 8)); hash ^= static_cast<u16>(c);
} }
return hash; return hash;
} }