aaru-dps/libaaruformat
1
0
Fork 0
mirror of https://github.com/aaru-dps/libaaruformat.git synced 2025-12-16 19:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor DDT handling to use uint64_t for sector prefix and suffix data types

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-10 22:06:48 +01:00
parent 9e3c0af774
commit 2806b879a8
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ddt/ddt_v2.c
View File

@@ -303,8 +303,7 @@ int32_t process_ddt_v2(aaruformat_context *ctx, IndexEntry *entry, bool *found_u
break; break;
} }
} }
else if(entry->dataType == CdSectorPrefixCorrected || entry->dataType == CdSectorSuffixCorrected) else if(entry->dataType == CdSectorPrefix || entry->dataType == CdSectorSuffix)
{
switch(ddt_header.compression) switch(ddt_header.compression)
{ {
case Lzma: case Lzma:
@@ -397,8 +396,10 @@ int32_t process_ddt_v2(aaruformat_context *ctx, IndexEntry *entry, bool *found_u
return AARUF_ERROR_INVALID_BLOCK_CRC; return AARUF_ERROR_INVALID_BLOCK_CRC;
} }
if(entry->dataType == CdSectorPrefixCorrected) { ctx->sector_prefix_ddt = (uint32_t *)buffer; } if(entry->dataType == CdSectorPrefix)
else if(entry->dataType == CdSectorSuffixCorrected) { ctx->sector_suffix_ddt = (uint32_t *)buffer; } ctx->sector_prefix_ddt2 = (uint64_t *)buffer;
else if(entry->dataType == CdSectorSuffix)
ctx->sector_suffix_ddt2 = (uint64_t *)buffer;
else else
free(buffer); free(buffer);
@@ -443,8 +444,10 @@ int32_t process_ddt_v2(aaruformat_context *ctx, IndexEntry *entry, bool *found_u
return AARUF_ERROR_INVALID_BLOCK_CRC; return AARUF_ERROR_INVALID_BLOCK_CRC;
} }
if(entry->dataType == CdSectorPrefixCorrected) { ctx->sector_prefix_ddt = (uint32_t *)buffer; } if(entry->dataType == CdSectorPrefix)
else if(entry->dataType == CdSectorSuffixCorrected) { ctx->sector_suffix_ddt = (uint32_t *)buffer; } ctx->sector_prefix_ddt2 = (uint64_t *)buffer;
else if(entry->dataType == CdSectorSuffix)
ctx->sector_suffix_ddt2 = (uint64_t *)buffer;
else else
free(buffer); free(buffer);
@@ -453,7 +456,6 @@ int32_t process_ddt_v2(aaruformat_context *ctx, IndexEntry *entry, bool *found_u
TRACE("Found unknown compression type %d, continuing...", ddt_header.compression); TRACE("Found unknown compression type %d, continuing...", ddt_header.compression);
break; break;
} }
}
TRACE("Exiting process_ddt_v2() = AARUF_STATUS_OK"); TRACE("Exiting process_ddt_v2() = AARUF_STATUS_OK");
return AARUF_STATUS_OK; return AARUF_STATUS_OK;
@@ -1350,12 +1352,10 @@ bool set_ddt_multi_level_v2(aaruformat_context *ctx, uint64_t sector_address, bo
TRACE("Successfully wrote never-written cached secondary DDT to disk"); TRACE("Successfully wrote never-written cached secondary DDT to disk");
} }
else else
{
// The cached DDT is actually for the requested block range, so we can use it directly // The cached DDT is actually for the requested block range, so we can use it directly
TRACE("Cached DDT is for the correct block range, using it directly"); TRACE("Cached DDT is for the correct block range, using it directly");
// No need to write to disk, just continue with the cached table // No need to write to disk, just continue with the cached table
} }
}
// Step 3: Write the currently in-memory cached secondary level table to the end of the file // Step 3: Write the currently in-memory cached secondary level table to the end of the file
if(ctx->cached_ddt_offset != 0) if(ctx->cached_ddt_offset != 0)