summaryrefslogtreecommitdiff
path: root/sha1-array.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-03-31 01:39:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-31 15:33:55 (GMT)
commit1b7ba794d21836f72e5888db63ab790077c04e1b (patch)
tree7b320b3ab15ac6a85e499619bbfbad3d02c00e69 /sha1-array.c
parent5d3206d5010423b3bbf479e32567d0fddc7095e0 (diff)
downloadgit-1b7ba794d21836f72e5888db63ab790077c04e1b.zip
git-1b7ba794d21836f72e5888db63ab790077c04e1b.tar.gz
git-1b7ba794d21836f72e5888db63ab790077c04e1b.tar.bz2
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>
Diffstat (limited to 'sha1-array.c')
-rw-r--r--sha1-array.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sha1-array.c b/sha1-array.c
index 1082b3d..82a7f44 100644
--- a/sha1-array.c
+++ b/sha1-array.c
@@ -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;
}