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 --- http-backend.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'http-backend.c') diff --git a/http-backend.c b/http-backend.c index b6c0484fb..e4f3de3b7 100644 --- a/http-backend.c +++ b/http-backend.c @@ -395,8 +395,11 @@ static void get_info_refs(char *arg) run_service(argv); } else { + struct each_ref_fn_sha1_adapter wrapped_show_text_ref = + {show_text_ref, &buf}; + select_getanyfile(); - for_each_namespaced_ref(show_text_ref, &buf); + for_each_namespaced_ref(each_ref_fn_adapter, &wrapped_show_text_ref); send_strbuf("text/plain", &buf); } strbuf_release(&buf); @@ -425,9 +428,11 @@ static int show_head_ref(const char *refname, const unsigned char *sha1, static void get_head(char *arg) { struct strbuf buf = STRBUF_INIT; + struct each_ref_fn_sha1_adapter wrapped_show_head_ref = + {show_head_ref, &buf}; select_getanyfile(); - head_ref_namespaced(show_head_ref, &buf); + head_ref_namespaced(each_ref_fn_adapter, &wrapped_show_head_ref); send_strbuf("text/plain", &buf); strbuf_release(&buf); } -- cgit v1.2.1 From f72f54210728a3550fa314e99470dcbbef001297 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 25 May 2015 18:38:55 +0000 Subject: http-backend: rewrite to take an object_id argument Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- http-backend.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'http-backend.c') diff --git a/http-backend.c b/http-backend.c index e4f3de3b7..a2d388de9 100644 --- a/http-backend.c +++ b/http-backend.c @@ -350,16 +350,16 @@ static void run_service(const char **argv) exit(1); } -static int show_text_ref(const char *name, const unsigned char *sha1, - int flag, void *cb_data) +static int show_text_ref(const char *name, const struct object_id *oid, + int flag, void *cb_data) { const char *name_nons = strip_namespace(name); struct strbuf *buf = cb_data; - struct object *o = parse_object(sha1); + struct object *o = parse_object(oid->hash); if (!o) return 0; - strbuf_addf(buf, "%s\t%s\n", sha1_to_hex(sha1), name_nons); + strbuf_addf(buf, "%s\t%s\n", oid_to_hex(oid), name_nons); if (o->type == OBJ_TAG) { o = deref_tag(o, name, 0); if (!o) @@ -395,18 +395,15 @@ static void get_info_refs(char *arg) run_service(argv); } else { - struct each_ref_fn_sha1_adapter wrapped_show_text_ref = - {show_text_ref, &buf}; - select_getanyfile(); - for_each_namespaced_ref(each_ref_fn_adapter, &wrapped_show_text_ref); + for_each_namespaced_ref(show_text_ref, &buf); send_strbuf("text/plain", &buf); } strbuf_release(&buf); } -static int show_head_ref(const char *refname, const unsigned char *sha1, - int flag, void *cb_data) +static int show_head_ref(const char *refname, const struct object_id *oid, + int flag, void *cb_data) { struct strbuf *buf = cb_data; @@ -419,7 +416,7 @@ static int show_head_ref(const char *refname, const unsigned char *sha1, strbuf_addf(buf, "ref: %s\n", target_nons); } else { - strbuf_addf(buf, "%s\n", sha1_to_hex(sha1)); + strbuf_addf(buf, "%s\n", oid_to_hex(oid)); } return 0; @@ -428,11 +425,9 @@ static int show_head_ref(const char *refname, const unsigned char *sha1, static void get_head(char *arg) { struct strbuf buf = STRBUF_INIT; - struct each_ref_fn_sha1_adapter wrapped_show_head_ref = - {show_head_ref, &buf}; select_getanyfile(); - head_ref_namespaced(each_ref_fn_adapter, &wrapped_show_head_ref); + head_ref_namespaced(show_head_ref, &buf); send_strbuf("text/plain", &buf); strbuf_release(&buf); } -- cgit v1.2.1 From 5f9cf5abd2f918d374d11a0f468bc2387a3d32c2 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 25 May 2015 18:38:56 +0000 Subject: show_head_ref(): convert local variable "unused" to object_id Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- http-backend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'http-backend.c') diff --git a/http-backend.c b/http-backend.c index a2d388de9..55353ad66 100644 --- a/http-backend.c +++ b/http-backend.c @@ -408,10 +408,10 @@ static int show_head_ref(const char *refname, const struct object_id *oid, struct strbuf *buf = cb_data; if (flag & REF_ISSYMREF) { - unsigned char unused[20]; + struct object_id unused; const char *target = resolve_ref_unsafe(refname, RESOLVE_REF_READING, - unused, NULL); + unused.hash, NULL); const char *target_nons = strip_namespace(target); strbuf_addf(buf, "ref: %s\n", target_nons); -- cgit v1.2.1