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 --- refs.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'refs.h') diff --git a/refs.h b/refs.h index 6d7d9b40f3..4042109f05 100644 --- a/refs.h +++ b/refs.h @@ -67,7 +67,18 @@ struct ref_transaction; * single callback invocation. */ typedef int each_ref_fn(const char *refname, - const unsigned char *sha1, int flags, void *cb_data); + const struct object_id *oid, int flags, void *cb_data); + +typedef int each_ref_sha1_fn(const char *refname, + const unsigned char *sha1, int flags, void *cb_data); + +struct each_ref_fn_sha1_adapter { + each_ref_sha1_fn *original_fn; + void *original_cb_data; +}; + +extern int each_ref_fn_adapter(const char *refname, + const struct object_id *oid, int flags, void *cb_data); /* * The following functions invoke the specified callback function for -- cgit v1.2.3 From 0a0c9532170e6f2fec1a89aa4dff94c74d2d11d7 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 25 May 2015 18:39:20 +0000 Subject: each_ref_fn_adapter(): remove adapter All of the callers of the for_each_ref family of functions have now been rewritten to work with object_ids, so this adapter is no longer needed. Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- refs.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'refs.h') diff --git a/refs.h b/refs.h index 4042109f05..8c3d433a8a 100644 --- a/refs.h +++ b/refs.h @@ -69,17 +69,6 @@ struct ref_transaction; typedef int each_ref_fn(const char *refname, const struct object_id *oid, int flags, void *cb_data); -typedef int each_ref_sha1_fn(const char *refname, - const unsigned char *sha1, int flags, void *cb_data); - -struct each_ref_fn_sha1_adapter { - each_ref_sha1_fn *original_fn; - void *original_cb_data; -}; - -extern int each_ref_fn_adapter(const char *refname, - const struct object_id *oid, int flags, void *cb_data); - /* * The following functions invoke the specified callback function for * each reference indicated. If the function ever returns a nonzero -- cgit v1.2.3