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

Fix LGTM alerts

Browse Source
This commit is contained in:
Pengfei
2021-07-12 12:14:00 +08:00
parent 6fbbae7039
commit d002928a38
4 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/data_container.cpp
+2 -1
View File
@@ -11,7 +11,8 @@ namespace Core {
DPFSContainer::DPFSContainer(DPFSDescriptor descriptor_, u8 level1_selector_,
std::vector<u32_le> data_)
: descriptor(descriptor_), level1_selector(level1_selector_), data(std::move(data_)) {
: descriptor(std::move(descriptor_)), level1_selector(level1_selector_),
data(std::move(data_)) {
ASSERT_MSG(descriptor.magic == MakeMagic('D', 'P', 'F', 'S'), "DPFS Magic is not correct");
ASSERT_MSG(descriptor.version == 0x10000, "DPFS Version is not correct");
src/core/inner_fat.hpp
+8 -8
View File
@@ -245,12 +245,13 @@ protected:
last_block = fat[block + 2].v.index - 1;
}
const std::size_t size =
// offset & size of the data chunk represented by the FAT node
const auto offset = static_cast<std::ptrdiff_t>(fs_info.data_region_block_size) * block;
const auto size =
static_cast<std::size_t>(fs_info.data_region_block_size) * (last_block - block + 1);
const std::size_t to_write = std::min<std::size_t>(file_size, size);
TRY(CheckedMemcpy(out.data() + written, data_region,
fs_info.data_region_block_size * block, to_write),
const auto to_write = std::min<std::size_t>(file_size, size);
TRY(CheckedMemcpy(out.data() + written, data_region, offset, to_write),
LOG_ERROR(Core, "File data out of bound"));
file_size -= to_write;
written += to_write;
@@ -301,7 +302,7 @@ public:
std::array<char, 17> name_data = {}; // Append a null terminator
std::memcpy(name_data.data(), entry.name.data(), entry.name.size());
std::string name = name_data.data();
const std::string name = name_data.data();
std::string new_path = name.empty() ? path : path + name + "/"; // Name is empty for root
if (!FileUtil::CreateFullPath(new_path)) {
@@ -317,13 +318,12 @@ public:
return false;
}
const auto& file_entry = this->file_entry_table[cur];
std::array<char, 17> name_data = {}; // Append a null terminator
std::memcpy(name_data.data(), file_entry.name.data(), file_entry.name.size());
if (!static_cast<const T*>(this)->ExtractFile(new_path + std::string{name_data.data()},
cur))
cur)) {
return false;
}
cur = this->file_entry_table[cur].next_sibling_index;
}