Remove get_object_hash.

Convert all instances of get_object_hash to use an appropriate reference
to the hash member of the oid member of struct object.  This provides no
functional change, as it is essentially a macro substitution.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
brian m. carlson
2015-11-10 02:22:29 +00:00
committed by Jeff King
parent f2fd0760f6
commit ed1c9977cb
63 changed files with 251 additions and 253 deletions

View File

@ -68,7 +68,7 @@ static unsigned int hash_obj(const unsigned char *sha1, unsigned int n)
*/
static void insert_obj_hash(struct object *obj, struct object **hash, unsigned int size)
{
unsigned int j = hash_obj(get_object_hash(*obj), size);
unsigned int j = hash_obj(obj->oid.hash, size);
while (hash[j]) {
j++;
@ -92,7 +92,7 @@ struct object *lookup_object(const unsigned char *sha1)
first = i = hash_obj(sha1, obj_hash_size);
while ((obj = obj_hash[i]) != NULL) {
if (!hashcmp(sha1, get_object_hash(*obj)))
if (!hashcmp(sha1, obj->oid.hash))
break;
i++;
if (i == obj_hash_size)
@ -145,7 +145,7 @@ void *create_object(const unsigned char *sha1, void *o)
obj->parsed = 0;
obj->used = 0;
obj->flags = 0;
hashcpy(get_object_hash(*obj), sha1);
hashcpy(obj->oid.hash, sha1);
if (obj_hash_size - 1 <= nr_objs * 2)
grow_object_hash();