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 --- help.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'help.c') diff --git a/help.c b/help.c index 2072a873e2..f81309319d 100644 --- a/help.c +++ b/help.c @@ -425,10 +425,12 @@ static struct string_list guess_refs(const char *ref) { struct similar_ref_cb ref_cb; struct string_list similar_refs = STRING_LIST_INIT_NODUP; + struct each_ref_fn_sha1_adapter wrapped_append_similar_ref = + {append_similar_ref, &ref_cb}; ref_cb.base_ref = ref; ref_cb.similar_refs = &similar_refs; - for_each_ref(append_similar_ref, &ref_cb); + for_each_ref(each_ref_fn_adapter, &wrapped_append_similar_ref); return similar_refs; } -- cgit v1.2.1 From 91d6e94ea6238f6678718c53b8aaef733c7b5a05 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 25 May 2015 18:38:54 +0000 Subject: append_similar_ref(): rewrite to take an object_id argument Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- help.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'help.c') diff --git a/help.c b/help.c index f81309319d..6f3415b0fc 100644 --- a/help.c +++ b/help.c @@ -407,7 +407,7 @@ struct similar_ref_cb { struct string_list *similar_refs; }; -static int append_similar_ref(const char *refname, const unsigned char *sha1, +static int append_similar_ref(const char *refname, const struct object_id *oid, int flags, void *cb_data) { struct similar_ref_cb *cb = (struct similar_ref_cb *)(cb_data); @@ -425,12 +425,10 @@ static struct string_list guess_refs(const char *ref) { struct similar_ref_cb ref_cb; struct string_list similar_refs = STRING_LIST_INIT_NODUP; - struct each_ref_fn_sha1_adapter wrapped_append_similar_ref = - {append_similar_ref, &ref_cb}; ref_cb.base_ref = ref; ref_cb.similar_refs = &similar_refs; - for_each_ref(each_ref_fn_adapter, &wrapped_append_similar_ref); + for_each_ref(append_similar_ref, &ref_cb); return similar_refs; } -- cgit v1.2.1