ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MemoryCardImage: Fix incorrect format string

This commit is contained in:
Connor McLaughlin 2021-06-26 00:03:18 +10:00
parent 1ecf5cf76a
commit c44e614913
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/memory_card_image.cpp
View File

@ -423,6 +423,7 @@ bool UndeleteFile(DataArray* data, const FileInfo& fi)
u32 block_number = fi.first_block; u32 block_number = fi.first_block;
for (u32 i = 0; i < fi.num_blocks && (block_number > 0 && block_number < NUM_BLOCKS); i++) for (u32 i = 0; i < fi.num_blocks && (block_number > 0 && block_number < NUM_BLOCKS); i++)
{ {
const u32 this_block_number = block_number;
DirectoryFrame* df = GetFramePtr<DirectoryFrame>(data, 0, block_number); DirectoryFrame* df = GetFramePtr<DirectoryFrame>(data, 0, block_number);
block_number = ZeroExtend32(df->next_block_number) + 1; block_number = ZeroExtend32(df->next_block_number) + 1;
@ -430,7 +431,8 @@ bool UndeleteFile(DataArray* data, const FileInfo& fi)
{ {
if (df->block_allocation_state != 0xA1) if (df->block_allocation_state != 0xA1)
{ {
Log_ErrorPrintf("Incorrect block state for %u, expected 0xA1 got 0x%02X", df->block_allocation_state); Log_ErrorPrintf("Incorrect block state for %u, expected 0xA1 got 0x%02X", this_block_number,
df->block_allocation_state);
return false; return false;
} }
} }
@ -438,7 +440,8 @@ bool UndeleteFile(DataArray* data, const FileInfo& fi)
{ {
if (df->block_allocation_state != 0xA3) if (df->block_allocation_state != 0xA3)
{ {
Log_ErrorPrintf("Incorrect block state for %u, expected 0xA3 got 0x%02X", df->block_allocation_state); Log_ErrorPrintf("Incorrect block state for %u, expected 0xA3 got 0x%02X", this_block_number,
df->block_allocation_state);
return false; return false;
} }
} }
@ -446,7 +449,8 @@ bool UndeleteFile(DataArray* data, const FileInfo& fi)
{ {
if (df->block_allocation_state != 0xA2) if (df->block_allocation_state != 0xA2)
{ {
Log_WarningPrintf("Incorrect block state for %u, expected 0xA2 got 0x%02X", df->block_allocation_state); Log_WarningPrintf("Incorrect block state for %u, expected 0xA2 got 0x%02X", this_block_number,
df->block_allocation_state);
return false; return false;
} }
} }
@ -459,26 +463,11 @@ bool UndeleteFile(DataArray* data, const FileInfo& fi)
block_number = ZeroExtend32(df->next_block_number) + 1; block_number = ZeroExtend32(df->next_block_number) + 1;
if (i == 0) if (i == 0)
{
if (df->block_allocation_state != 0xA1)
Log_WarningPrintf("Incorrect block state for %u, expected 0xA1 got 0x%02X", df->block_allocation_state);
df->block_allocation_state = 0x51; df->block_allocation_state = 0x51;
}
else if (i == (fi.num_blocks - 1)) else if (i == (fi.num_blocks - 1))
{
if (df->block_allocation_state != 0xA3)
Log_WarningPrintf("Incorrect block state for %u, expected 0xA3 got 0x%02X", df->block_allocation_state);
df->block_allocation_state = 0x53; df->block_allocation_state = 0x53;
}
else else
{
if (df->block_allocation_state != 0xA2)
Log_WarningPrintf("Incorrect block state for %u, expected 0xA2 got 0x%02X", df->block_allocation_state);
df->block_allocation_state = 0x52; df->block_allocation_state = 0x52;
}
UpdateChecksum(df); UpdateChecksum(df);
} }