From 2b2a5be394bc67bed86bc009195c664dca740bd6 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 25 May 2015 18:38:28 +0000 Subject: 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 Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- bisect.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bisect.c') diff --git a/bisect.c b/bisect.c index 10f5e57ef..0848d9146 100644 --- a/bisect.c +++ b/bisect.c @@ -417,7 +417,10 @@ static int register_ref(const char *refname, const unsigned char *sha1, static int read_bisect_refs(void) { - return for_each_ref_in("refs/bisect/", register_ref, NULL); + struct each_ref_fn_sha1_adapter wrapped_register_ref = + {register_ref, NULL}; + + return for_each_ref_in("refs/bisect/", each_ref_fn_adapter, &wrapped_register_ref); } static void read_bisect_paths(struct argv_array *array) -- cgit v1.2.1