each_ref_fn: change to take an object_id parameter
Change typedef each_ref_fn to take a "const struct object_id *oid" parameter instead of "const unsigned char *sha1". To aid this transition, implement an adapter that can be used to wrap old-style functions matching the old typedef, which is now called "each_ref_sha1_fn"), and make such functions callable via the new interface. This requires the old function and its cb_data to be wrapped in a "struct each_ref_fn_sha1_adapter", and that object to be used as the cb_data for an adapter function, each_ref_fn_adapter(). This is an enormous diff, but most of it consists of simple, mechanical changes to the sites that call any of the "for_each_ref" family of functions. Subsequent to this change, the call sites can be rewritten one by one to use the new interface. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
8353847e85
commit
2b2a5be394
@ -149,10 +149,13 @@ static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
|
||||
void load_ref_decorations(int flags)
|
||||
{
|
||||
if (!decoration_loaded) {
|
||||
struct each_ref_fn_sha1_adapter wrapped_add_ref_decoration =
|
||||
{add_ref_decoration, NULL};
|
||||
|
||||
decoration_loaded = 1;
|
||||
decoration_flags = flags;
|
||||
for_each_ref(add_ref_decoration, NULL);
|
||||
head_ref(add_ref_decoration, NULL);
|
||||
for_each_ref(each_ref_fn_adapter, &wrapped_add_ref_decoration);
|
||||
head_ref(each_ref_fn_adapter, &wrapped_add_ref_decoration);
|
||||
for_each_commit_graft(add_graft_decoration, NULL);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user