mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Make show_entry void
Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
eddd1c8cef
commit
cf995ede2c
12
tree-diff.c
12
tree-diff.c
|
@ -15,7 +15,8 @@ static char *malloc_base(const char *base, const char *path, int pathlen)
|
||||||
return newbase;
|
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)
|
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 */
|
/* 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;
|
unsigned mode;
|
||||||
const char *path;
|
const char *path;
|
||||||
|
@ -152,11 +154,9 @@ static int show_entry(struct diff_options *opt, const char *prefix, struct tree_
|
||||||
|
|
||||||
free(tree);
|
free(tree);
|
||||||
free(newbase);
|
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)
|
int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt)
|
||||||
|
|
Loading…
Reference in a new issue