diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-10-15 00:01:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-15 03:53:15 (GMT) |
| commit | fa130802d9ccde50e4097b2b1c5324990be3ffb4 (patch) | |
| tree | 5dd6dfb4212ff379b42ce9ca530012f93da33402 /pack-revindex.c | |
| parent | 7b5e614e2acc2f4e6b2f1ea4eb93dd430d350abd (diff) | |
| download | git-fa130802d9ccde50e4097b2b1c5324990be3ffb4.zip git-fa130802d9ccde50e4097b2b1c5324990be3ffb4.tar.gz git-fa130802d9ccde50e4097b2b1c5324990be3ffb4.tar.bz2 | |
pack-revindex: express constants in terms of the_hash_algo
Express the various constants used in terms of the_hash_algo.
While we're at it, fix a comment style issue as well.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-revindex.c')
| -rw-r--r-- | pack-revindex.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pack-revindex.c b/pack-revindex.c index bb521cf..3c58784 100644 --- a/pack-revindex.c +++ b/pack-revindex.c @@ -122,13 +122,14 @@ static void create_pack_revindex(struct packed_git *p) unsigned num_ent = p->num_objects; unsigned i; const char *index = p->index_data; + const unsigned hashsz = the_hash_algo->rawsz; ALLOC_ARRAY(p->revindex, num_ent + 1); index += 4 * 256; if (p->index_version > 1) { const uint32_t *off_32 = - (uint32_t *)(index + 8 + p->num_objects * (20 + 4)); + (uint32_t *)(index + 8 + p->num_objects * (hashsz + 4)); const uint32_t *off_64 = off_32 + p->num_objects; for (i = 0; i < num_ent; i++) { uint32_t off = ntohl(*off_32++); @@ -142,16 +143,17 @@ static void create_pack_revindex(struct packed_git *p) } } else { for (i = 0; i < num_ent; i++) { - uint32_t hl = *((uint32_t *)(index + 24 * i)); + uint32_t hl = *((uint32_t *)(index + (hashsz + 4) * i)); p->revindex[i].offset = ntohl(hl); p->revindex[i].nr = i; } } - /* This knows the pack format -- the 20-byte trailer + /* + * This knows the pack format -- the hash trailer * follows immediately after the last object data. */ - p->revindex[num_ent].offset = p->pack_size - 20; + p->revindex[num_ent].offset = p->pack_size - hashsz; p->revindex[num_ent].nr = -1; sort_revindex(p->revindex, num_ent, p->pack_size); } |