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 --- transport.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'transport.c') diff --git a/transport.c b/transport.c index f080e93dc..58cb9ed03 100644 --- a/transport.c +++ b/transport.c @@ -363,7 +363,10 @@ static int rsync_transport_push(struct transport *transport, strbuf_addch(&temp_dir, '/'); if (flags & TRANSPORT_PUSH_ALL) { - if (for_each_ref(write_one_ref, &temp_dir)) + struct each_ref_fn_sha1_adapter wrapped_write_one_ref = + {write_one_ref, &temp_dir}; + + if (for_each_ref(each_ref_fn_adapter, &wrapped_write_one_ref)) return -1; } else if (write_refs_to_temp_dir(&temp_dir, refspec_nr, refspec)) return -1; -- cgit v1.2.1