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 --- shallow.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'shallow.c') diff --git a/shallow.c b/shallow.c index d08d264dd..9488edcbc 100644 --- a/shallow.c +++ b/shallow.c @@ -512,6 +512,8 @@ void assign_shallow_commits_to_refs(struct shallow_info *info, unsigned int i, nr; int *shallow, nr_shallow = 0; struct paint_info pi; + struct each_ref_fn_sha1_adapter wrapped_mark_uninteresting = + {mark_uninteresting, NULL}; trace_printf_key(&trace_shallow, "shallow: assign_shallow_commits_to_refs\n"); shallow = xmalloc(sizeof(*shallow) * (info->nr_ours + info->nr_theirs)); @@ -542,8 +544,8 @@ void assign_shallow_commits_to_refs(struct shallow_info *info, * connect to old refs. If not (e.g. force ref updates) it'll * have to go down to the current shallow commits. */ - head_ref(mark_uninteresting, NULL); - for_each_ref(mark_uninteresting, NULL); + head_ref(each_ref_fn_adapter, &wrapped_mark_uninteresting); + for_each_ref(each_ref_fn_adapter, &wrapped_mark_uninteresting); /* Mark potential bottoms so we won't go out of bound */ for (i = 0; i < nr_shallow; i++) { @@ -618,6 +620,8 @@ static void post_assign_shallow(struct shallow_info *info, int dst, i, j; int bitmap_nr = (info->ref->nr + 31) / 32; struct commit_array ca; + struct each_ref_fn_sha1_adapter wrapped_add_ref = + {add_ref, &ca}; trace_printf_key(&trace_shallow, "shallow: post_assign_shallow\n"); if (ref_status) @@ -641,8 +645,8 @@ static void post_assign_shallow(struct shallow_info *info, info->nr_theirs = dst; memset(&ca, 0, sizeof(ca)); - head_ref(add_ref, &ca); - for_each_ref(add_ref, &ca); + head_ref(each_ref_fn_adapter, &wrapped_add_ref); + for_each_ref(each_ref_fn_adapter, &wrapped_add_ref); /* Remove unreachable shallow commits from "ours" */ for (i = dst = 0; i < info->nr_ours; i++) { @@ -674,9 +678,12 @@ int delayed_reachability_test(struct shallow_info *si, int c) if (!si->commits) { struct commit_array ca; + struct each_ref_fn_sha1_adapter wrapped_add_ref = + {add_ref, &ca}; + memset(&ca, 0, sizeof(ca)); - head_ref(add_ref, &ca); - for_each_ref(add_ref, &ca); + head_ref(each_ref_fn_adapter, &wrapped_add_ref); + for_each_ref(each_ref_fn_adapter, &wrapped_add_ref); si->commits = ca.commits; si->nr_commits = ca.nr; } -- cgit v1.2.1