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 --- replace_object.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'replace_object.c') diff --git a/replace_object.c b/replace_object.c index 0ab2dc1374..a8a2da9448 100644 --- a/replace_object.c +++ b/replace_object.c @@ -80,11 +80,13 @@ static int register_replace_ref(const char *refname, static void prepare_replace_object(void) { static int replace_object_prepared; + struct each_ref_fn_sha1_adapter wrapped_register_replace_ref = + {register_replace_ref, NULL}; if (replace_object_prepared) return; - for_each_replace_ref(register_replace_ref, NULL); + for_each_replace_ref(each_ref_fn_adapter, &wrapped_register_replace_ref); replace_object_prepared = 1; if (!replace_object_nr) check_replace_refs = 0; -- cgit v1.2.1 From 00530834fb17f0ec070018270d0fb3e97e5dba07 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 25 May 2015 18:39:02 +0000 Subject: register_replace_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 --- replace_object.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'replace_object.c') diff --git a/replace_object.c b/replace_object.c index a8a2da9448..f0b39f06d5 100644 --- a/replace_object.c +++ b/replace_object.c @@ -53,7 +53,7 @@ static int register_replace_object(struct replace_object *replace, } static int register_replace_ref(const char *refname, - const unsigned char *sha1, + const struct object_id *oid, int flag, void *cb_data) { /* Get sha1 from refname */ @@ -68,7 +68,7 @@ static int register_replace_ref(const char *refname, } /* Copy sha1 from the read ref */ - hashcpy(repl_obj->replacement, sha1); + hashcpy(repl_obj->replacement, oid->hash); /* Register new object */ if (register_replace_object(repl_obj, 1)) @@ -80,13 +80,11 @@ static int register_replace_ref(const char *refname, static void prepare_replace_object(void) { static int replace_object_prepared; - struct each_ref_fn_sha1_adapter wrapped_register_replace_ref = - {register_replace_ref, NULL}; if (replace_object_prepared) return; - for_each_replace_ref(each_ref_fn_adapter, &wrapped_register_replace_ref); + for_each_replace_ref(register_replace_ref, NULL); replace_object_prepared = 1; if (!replace_object_nr) check_replace_refs = 0; -- cgit v1.2.1