sha1_array: let callbacks interrupt iteration

The callbacks for iterating a sha1_array must have a void
return.  This is unlike our usual for_each semantics, where
a callback may interrupt iteration and have its value
propagated. Let's switch it to the usual form, which will
enable its use in more places (e.g., where we are replacing
an existing iteration with a different data structure).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2016-09-26 08:00:29 -04:00
committed by Junio C Hamano
parent 0c99171ad2
commit 16ddcd403b
7 changed files with 24 additions and 12 deletions

View File

@ -268,9 +268,10 @@ static int show_ref_cb(const char *path_full, const struct object_id *oid,
return 0;
}
static void show_one_alternate_sha1(const unsigned char sha1[20], void *unused)
static int show_one_alternate_sha1(const unsigned char sha1[20], void *unused)
{
show_ref(".have", sha1);
return 0;
}
static void collect_one_alternate_ref(const struct ref *ref, void *data)