[3PP] Uplifted FMT version and adjusted messages

This commit is contained in:
Gliniak
2024-12-12 20:28:11 +01:00
parent 41771055f8
commit 3318ab5d4c
30 changed files with 68 additions and 43 deletions

View File

@@ -41,13 +41,14 @@ bool DiscImageDevice::Initialize() {
state.size = mmap_->size();
auto result = Verify(&state);
if (result != Error::kSuccess) {
XELOGE("Failed to verify disc image header: {}", result);
XELOGE("Failed to verify disc image header: {}",
static_cast<int32_t>(result));
return false;
}
result = ReadAllEntries(&state, state.ptr + state.root_offset);
if (result != Error::kSuccess) {
XELOGE("Failed to read all GDFX entries: {}", result);
XELOGE("Failed to read all GDFX entries: {}", static_cast<int32_t>(result));
return false;
}

View File

@@ -93,7 +93,8 @@ bool XContentContainerDevice::Initialize() {
auto header_loading_result = ReadHeaderAndVerify(header_file);
if (header_loading_result != Result::kSuccess) {
XELOGE("Error reading XContent header: {}", header_loading_result);
XELOGE("Error reading XContent header: {}",
static_cast<int32_t>(header_loading_result));
fclose(header_file);
return false;
}

View File

@@ -158,8 +158,8 @@ std::unique_ptr<XContentContainerEntry> StfsContainerDevice::ReadEntry(
XELOGW(
"STFS file {} only found {} bytes for file, expected {} ({} "
"bytes missing)",
name, dir_entry->length - remaining_size, dir_entry->length,
remaining_size);
name, dir_entry->length.get() - remaining_size,
dir_entry->length.get(), remaining_size);
assert_always();
}

View File

@@ -47,7 +47,8 @@ SvodContainerDevice::Result SvodContainerDevice::LoadHostFiles(
if (fragment_files.size() != header_->content_metadata.data_file_count) {
XELOGE("SVOD expecting {} data fragments, but {} are present.",
header_->content_metadata.data_file_count, fragment_files.size());
header_->content_metadata.data_file_count.get(),
fragment_files.size());
return Result::kFileMismatch;
}