mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-objects: convert locate_object_entry_hash() to object_id

Browse Source 
There are no callers of locate_object_entry_hash() that aren't just
passing us the "hash" member of a "struct object_id". Let's take the
whole struct, which gets us closer to removing all raw sha1 variables.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2019-06-20 03:41:07 -04:00
committed by Junio C Hamano
parent 3df28caefb
commit 5e7ac68028
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pack-objects.c
View File

@ -6,17 +6,17 @@
#include "config.h" #include "config.h"
static uint32_t locate_object_entry_hash(struct packing_data *pdata, static uint32_t locate_object_entry_hash(struct packing_data *pdata,
const unsigned char *sha1, const struct object_id *oid,
int *found) int *found)
{ {
uint32_t i, mask = (pdata->index_size - 1); uint32_t i, mask = (pdata->index_size - 1);
i = sha1hash(sha1) & mask; i = sha1hash(oid->hash) & mask;
while (pdata->index[i] > 0) { while (pdata->index[i] > 0) {
uint32_t pos = pdata->index[i] - 1; uint32_t pos = pdata->index[i] - 1;
if (hasheq(sha1, pdata->objects[pos].idx.oid.hash)) { if (oideq(oid, &pdata->objects[pos].idx.oid)) {
*found = 1; *found = 1;
return i; return i;
} }
@ -56,7 +56,7 @@ static void rehash_objects(struct packing_data *pdata)
for (i = 0; i < pdata->nr_objects; i++) { for (i = 0; i < pdata->nr_objects; i++) {
int found; int found;
uint32_t ix = locate_object_entry_hash(pdata, uint32_t ix = locate_object_entry_hash(pdata,
entry->idx.oid.hash, &entry->idx.oid,
&found); &found);
if (found) if (found)
@ -77,7 +77,7 @@ struct object_entry *packlist_find(struct packing_data *pdata,
if (!pdata->index_size) if (!pdata->index_size)
return NULL; return NULL;
i = locate_object_entry_hash(pdata, oid->hash, &found); i = locate_object_entry_hash(pdata, oid, &found);
if (index_pos) if (index_pos)
*index_pos = i; *index_pos = i;