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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2016-02-11 17:26:44 -05:00
committed by Junio C Hamano
parent f3badaed51
commit dc06dc8800
9 changed files with 19 additions and 25 deletions

View File

@ -21,17 +21,17 @@
volatile show_early_output_fn_t show_early_output;
char *path_name(const struct name_path *path, const char *name)
char *path_name(struct strbuf *path, const char *name)
{
struct strbuf ret = STRBUF_INIT;
if (path)
strbuf_addbuf(&ret, path->base);
strbuf_addbuf(&ret, path);
strbuf_addstr(&ret, name);
return strbuf_detach(&ret, NULL);
}
void show_object_with_name(FILE *out, struct object *obj,
const struct name_path *path, const char *component)
struct strbuf *path, const char *component)
{
char *name = path_name(path, component);
char *p;