| Index: net/disk_cache/blockfile/disk_format_base.h
|
| diff --git a/net/disk_cache/blockfile/disk_format_base.h b/net/disk_cache/blockfile/disk_format_base.h
|
| index 9f4c16e4fd431859546e1713cb9a28fad40f7389..72d6b0310abea324b7fc1d168382440f42c990e1 100644
|
| --- a/net/disk_cache/blockfile/disk_format_base.h
|
| +++ b/net/disk_cache/blockfile/disk_format_base.h
|
| @@ -27,7 +27,7 @@ namespace disk_cache {
|
|
|
| typedef uint32 CacheAddr;
|
|
|
| -const uint32 kBlockVersion2 = 0x20000; // Version 2.0.
|
| +const uint32 kBlockVersion2 = 0x20000; // Version 2.0.
|
| const uint32 kBlockCurrentVersion = 0x30000; // Version 3.0.
|
|
|
| const uint32 kBlockMagic = 0xC104CAC3;
|
| @@ -47,18 +47,18 @@ typedef uint32 AllocBitmap[kMaxBlocks / 32];
|
| // from the beginning every time).
|
| // This Structure is the header of a block-file:
|
| struct BlockFileHeader {
|
| - uint32 magic;
|
| - uint32 version;
|
| - int16 this_file; // Index of this file.
|
| - int16 next_file; // Next file when this one is full.
|
| - int32 entry_size; // Size of the blocks of this file.
|
| - int32 num_entries; // Number of stored entries.
|
| - int32 max_entries; // Current maximum number of entries.
|
| - int32 empty[4]; // Counters of empty entries for each type.
|
| - int32 hints[4]; // Last used position for each entry type.
|
| - volatile int32 updating; // Keep track of updates to the header.
|
| - int32 user[5];
|
| - AllocBitmap allocation_map;
|
| + uint32 magic;
|
| + uint32 version;
|
| + int16 this_file; // Index of this file.
|
| + int16 next_file; // Next file when this one is full.
|
| + int32 entry_size; // Size of the blocks of this file.
|
| + int32 num_entries; // Number of stored entries.
|
| + int32 max_entries; // Current maximum number of entries.
|
| + int32 empty[4]; // Counters of empty entries for each type.
|
| + int32 hints[4]; // Last used position for each entry type.
|
| + volatile int32 updating; // Keep track of updates to the header.
|
| + int32 user[5];
|
| + AllocBitmap allocation_map;
|
| };
|
|
|
| COMPILE_ASSERT(sizeof(BlockFileHeader) == kBlockHeaderSize, bad_header);
|
| @@ -103,11 +103,11 @@ COMPILE_ASSERT(sizeof(BlockFileHeader) == kBlockHeaderSize, bad_header);
|
| // to be only partialy filled. In that case, last_block and last_block_len will
|
| // keep track of that block.
|
| struct SparseHeader {
|
| - int64 signature; // The parent and children signature.
|
| - uint32 magic; // Structure identifier (equal to kIndexMagic).
|
| - int32 parent_key_len; // Key length for the parent entry.
|
| - int32 last_block; // Index of the last written block.
|
| - int32 last_block_len; // Lenght of the last written block.
|
| + int64 signature; // The parent and children signature.
|
| + uint32 magic; // Structure identifier (equal to kIndexMagic).
|
| + int32 parent_key_len; // Key length for the parent entry.
|
| + int32 last_block; // Index of the last written block.
|
| + int32 last_block_len; // Lenght of the last written block.
|
| int32 dummy[10];
|
| };
|
|
|
| @@ -115,11 +115,11 @@ struct SparseHeader {
|
| // structure.
|
| struct SparseData {
|
| SparseHeader header;
|
| - uint32 bitmap[32]; // Bitmap representation of known children (if this
|
| - // is a parent entry), or used blocks (for child
|
| - // entries. The size is fixed for child entries but
|
| - // not for parents; it can be as small as 4 bytes
|
| - // and as large as 8 KB.
|
| + uint32 bitmap[32]; // Bitmap representation of known children (if this
|
| + // is a parent entry), or used blocks (for child
|
| + // entries. The size is fixed for child entries but
|
| + // not for parents; it can be as small as 4 bytes
|
| + // and as large as 8 KB.
|
| };
|
|
|
| // The number of blocks stored by a child entry.
|
|
|