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

sha1_array: let callbacks interrupt iteration

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/cat-file.c
View File

@ -401,11 +401,12 @@ struct object_cb_data {
struct expand_data *expand;
};
static void batch_object_cb(const unsigned char sha1[20], void *vdata)
static int batch_object_cb(const unsigned char sha1[20], void *vdata)
{
struct object_cb_data *data = vdata;
hashcpy(data->expand->oid.hash, sha1);
batch_object_write(NULL, data->opt, data->expand);
return 0;
}
static int batch_loose_object(const unsigned char *sha1,