undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-revindex: express constants in terms of the_hash_algo

Browse Source 
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>
This commit is contained in:
brian m. carlson 2018-10-15 00:01:53 +00:00 committed by Junio C Hamano
parent 7b5e614e2a
commit fa130802d9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pack-revindex.c
View File

@ -122,13 +122,14 @@ static void create_pack_revindex(struct packed_git *p)
unsigned num_ent = p->num_objects; unsigned num_ent = p->num_objects;
unsigned i; unsigned i;
const char *index = p->index_data; const char *index = p->index_data;
const unsigned hashsz = the_hash_algo->rawsz;
ALLOC_ARRAY(p->revindex, num_ent + 1); ALLOC_ARRAY(p->revindex, num_ent + 1);
index += 4 * 256; index += 4 * 256;
if (p->index_version > 1) { if (p->index_version > 1) {
const uint32_t *off_32 = 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; const uint32_t *off_64 = off_32 + p->num_objects;
for (i = 0; i < num_ent; i++) { for (i = 0; i < num_ent; i++) {
uint32_t off = ntohl(*off_32++); uint32_t off = ntohl(*off_32++);
@ -142,16 +143,17 @@ static void create_pack_revindex(struct packed_git *p)
} }
} else { } else {
for (i = 0; i < num_ent; i++) { 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].offset = ntohl(hl);
p->revindex[i].nr = i; 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. * 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; p->revindex[num_ent].nr = -1;
sort_revindex(p->revindex, num_ent, p->pack_size); sort_revindex(p->revindex, num_ent, p->pack_size);
} }