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
@ -395,8 +395,11 @@ static void get_info_refs(char *arg)
|
||||
run_service(argv);
|
||||
|
||||
} else {
|
||||
struct each_ref_fn_sha1_adapter wrapped_show_text_ref =
|
||||
{show_text_ref, &buf};
|
||||
|
||||
select_getanyfile();
|
||||
for_each_namespaced_ref(show_text_ref, &buf);
|
||||
for_each_namespaced_ref(each_ref_fn_adapter, &wrapped_show_text_ref);
|
||||
send_strbuf("text/plain", &buf);
|
||||
}
|
||||
strbuf_release(&buf);
|
||||
@ -425,9 +428,11 @@ static int show_head_ref(const char *refname, const unsigned char *sha1,
|
||||
static void get_head(char *arg)
|
||||
{
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
struct each_ref_fn_sha1_adapter wrapped_show_head_ref =
|
||||
{show_head_ref, &buf};
|
||||
|
||||
select_getanyfile();
|
||||
head_ref_namespaced(show_head_ref, &buf);
|
||||
head_ref_namespaced(each_ref_fn_adapter, &wrapped_show_head_ref);
|
||||
send_strbuf("text/plain", &buf);
|
||||
strbuf_release(&buf);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user