提交 cf995ede 编写于 作者: D David Rientjes 提交者: Junio C Hamano

Make show_entry void

Signed-off-by: NDavid Rientjes <rientjes@google.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 eddd1c8c
......@@ -15,7 +15,8 @@ static char *malloc_base(const char *base, const char *path, int pathlen)
return newbase;
}
static int show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc, const char *base);
static void show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc,
const char *base);
static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt)
{
......@@ -131,7 +132,8 @@ static void show_tree(struct diff_options *opt, const char *prefix, struct tree_
}
/* A file entry went away or appeared */
static int show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc, const char *base)
static void show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc,
const char *base)
{
unsigned mode;
const char *path;
......@@ -152,11 +154,9 @@ static int show_entry(struct diff_options *opt, const char *prefix, struct tree_
free(tree);
free(newbase);
return 0;
} else {
opt->add_remove(opt, prefix[0], mode, sha1, base, path);
}
opt->add_remove(opt, prefix[0], mode, sha1, base, path);
return 0;
}
int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册