Convert sha1_array_for_each_unique and for_each_abbrev to object_id

Make sha1_array_for_each_unique take a callback using struct object_id.
Since one of these callbacks is an argument to for_each_abbrev, convert
those as well.  Rename various functions, replacing "sha1" with "oid".

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
2017-03-31 01:39:59 +00:00
committed by Junio C Hamano
parent 5d3206d501
commit 1b7ba794d2
9 changed files with 35 additions and 37 deletions

View File

@ -43,7 +43,7 @@ void sha1_array_clear(struct sha1_array *array)
}
int sha1_array_for_each_unique(struct sha1_array *array,
for_each_sha1_fn fn,
for_each_oid_fn fn,
void *data)
{
int i;
@ -55,7 +55,7 @@ int sha1_array_for_each_unique(struct sha1_array *array,
int ret;
if (i > 0 && !oidcmp(array->oid + i, array->oid + i - 1))
continue;
ret = fn(array->oid[i].hash, data);
ret = fn(array->oid + i, data);
if (ret)
return ret;
}