From bd64516aca4d4e22acb33c71429d293a14d355cf Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 11 Feb 2016 17:26:44 -0500 Subject: list-objects: drop name_path entirely In the previous commit, we left name_path as a thin wrapper around a strbuf. This patch drops it entirely. As a result, every show_object_fn callback needs to be adjusted. However, none of their code needs to be changed at all, because the only use was to pass it to path_name(), which now handles the bare strbuf. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- builtin/pack-objects.c | 4 ++-- builtin/rev-list.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'builtin') diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 4dae5b11c2..8bbb9bd9aa 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2285,7 +2285,7 @@ static void show_commit(struct commit *commit, void *data) } static void show_object(struct object *obj, - const struct name_path *path, const char *last, + struct strbuf *path, const char *last, void *data) { char *name = path_name(path, last); @@ -2480,7 +2480,7 @@ static int get_object_list_from_bitmap(struct rev_info *revs) } static void record_recent_object(struct object *obj, - const struct name_path *path, + struct strbuf *path, const char *last, void *data) { diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 3aa89a1a3c..a92c3ca852 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -178,7 +178,7 @@ static void finish_commit(struct commit *commit, void *data) } static void finish_object(struct object *obj, - const struct name_path *path, const char *name, + struct strbuf *path, const char *name, void *cb_data) { struct rev_list_info *info = cb_data; @@ -189,7 +189,7 @@ static void finish_object(struct object *obj, } static void show_object(struct object *obj, - const struct name_path *path, const char *component, + struct strbuf *path, const char *component, void *cb_data) { struct rev_list_info *info = cb_data; -- cgit v1.3