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 --- walker.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'walker.c') diff --git a/walker.c b/walker.c index 58ffeca264..bb2e0b9328 100644 --- a/walker.c +++ b/walker.c @@ -269,7 +269,10 @@ int walker_fetch(struct walker *walker, int targets, char **target, } if (!walker->get_recover) { - for_each_ref(mark_complete, NULL); + struct each_ref_fn_sha1_adapter wrapped_mark_complete = + {mark_complete, NULL}; + + for_each_ref(each_ref_fn_adapter, &wrapped_mark_complete); commit_list_sort_by_date(&complete); } -- cgit v1.2.1 From b4ebaf9eea30a38a0462ff72ea3e0aec0101bb7e Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 25 May 2015 18:39:14 +0000 Subject: mark_complete(): rewrite to take an object_id argument Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- walker.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'walker.c') diff --git a/walker.c b/walker.c index bb2e0b9328..44a936c1cf 100644 --- a/walker.c +++ b/walker.c @@ -200,9 +200,11 @@ static int interpret_target(struct walker *walker, char *target, unsigned char * return -1; } -static int mark_complete(const char *path, const unsigned char *sha1, int flag, void *cb_data) +static int mark_complete(const char *path, const struct object_id *oid, + int flag, void *cb_data) { - struct commit *commit = lookup_commit_reference_gently(sha1, 1); + struct commit *commit = lookup_commit_reference_gently(oid->hash, 1); + if (commit) { commit->object.flags |= COMPLETE; commit_list_insert(commit, &complete); @@ -269,10 +271,7 @@ int walker_fetch(struct walker *walker, int targets, char **target, } if (!walker->get_recover) { - struct each_ref_fn_sha1_adapter wrapped_mark_complete = - {mark_complete, NULL}; - - for_each_ref(each_ref_fn_adapter, &wrapped_mark_complete); + for_each_ref(mark_complete, NULL); commit_list_sort_by_date(&complete); } -- cgit v1.2.1