diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-05-25 21:38:28 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-25 22:19:27 +0300 |
commit | 2b2a5be394bc67bed86bc009195c664dca740bd6 (patch) | |
tree | 695bba8905d3f1d806ab329e65d2a297abfc85ac /builtin/replace.c | |
parent | 8353847e85128e0d0bbed862889f6f36c608c73b (diff) |
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 <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/replace.c')
-rw-r--r-- | builtin/replace.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index 54bf01acb4..bcf1508c08 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -66,6 +66,8 @@ static int show_reference(const char *refname, const unsigned char *sha1, static int list_replace_refs(const char *pattern, const char *format) { struct show_data data; + struct each_ref_fn_sha1_adapter wrapped_show_reference = + {show_reference, (void *) &data}; if (pattern == NULL) pattern = "*"; @@ -82,7 +84,7 @@ static int list_replace_refs(const char *pattern, const char *format) "valid formats are 'short', 'medium' and 'long'\n", format); - for_each_replace_ref(show_reference, (void *) &data); + for_each_replace_ref(each_ref_fn_adapter, &wrapped_show_reference); return 0; } |