Dark98/threeSD
1
0
Fork 0
mirror of https://github.com/Dark98/threeSD.git synced 2026-07-02 16:49:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make use of string_util

Browse Source
This commit is contained in:
Pengfei
2021-07-16 22:10:49 +08:00
parent 27988d09e2
commit 0c04e31405
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/inner_fat.hpp
+6 -7
View File
@@ -13,6 +13,7 @@
#include "common/common_types.h"
#include "common/file_util.h"
#include "common/logging/log.h"
#include "common/string_util.h"
#include "common/swap.h"
namespace Core {
@@ -292,10 +293,8 @@ public:
}
const auto& entry = this->directory_entry_table[index];
std::array<char, 17> name_data = {}; // Append a null terminator
std::memcpy(name_data.data(), entry.name.data(), entry.name.size());
const std::string name = name_data.data();
const std::string name =
Common::StringFromFixedZeroTerminatedBuffer(entry.name.data(), entry.name.size());
std::string new_path = name.empty() ? path : path + name + "/"; // Name is empty for root
if (!FileUtil::CreateFullPath(new_path)) {
@@ -311,10 +310,10 @@ public:
return false;
}
const auto& file_entry = this->file_entry_table[cur];
std::memcpy(name_data.data(), file_entry.name.data(), file_entry.name.size());
const std::string file_name = Common::StringFromFixedZeroTerminatedBuffer(
file_entry.name.data(), file_entry.name.size());
if (!static_cast<const T*>(this)->ExtractFile(new_path + std::string{name_data.data()},
cur)) {
if (!static_cast<const T*>(this)->ExtractFile(new_path + file_name, cur)) {
return false;
}
cur = this->file_entry_table[cur].next_sibling_index;